From cce5e697f972e17d799e95ef1f23676205b88374 Mon Sep 17 00:00:00 2001
From: Iury Gregory Melo Ferreira <iurygregory@gmail.com>
Date: Tue, 15 Nov 2016 23:48:41 -0300
Subject: [PATCH] Use new naming for authtoken variables

change old pattern tenant for project_name
drop _real suffix

Change-Id: I7bc232caedecfebf7ebe00923eff515e3c43b0c5
---
 manifests/api.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/api.pp b/manifests/api.pp
index 29009e82..fa5f47a6 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -342,14 +342,14 @@ running as a standalone service, or httpd for being run by a httpd server")
   }
 
   if $validate {
-    $keystone_tenant_real = $::cinder::keystone::authtoken::project_name
-    $keystone_username_real = $::cinder::keystone::authtoken::username
-    $keystone_password_real = $::cinder::keystone::authtoken::password
+    $keystone_project_name = $::cinder::keystone::authtoken::project_name
+    $keystone_username = $::cinder::keystone::authtoken::username
+    $keystone_password = $::cinder::keystone::authtoken::password
 
     $defaults = {
       'cinder-api' => {
         # lint:ignore:140chars
-        'command'  => "cinder --os-auth-url ${::cinder::keystone::authtoken::auth_uri} --os-project-name ${keystone_tenant_real} --os-username ${keystone_username_real} --os-password ${keystone_password_real} list",
+        'command'  => "cinder --os-auth-url ${::cinder::keystone::authtoken::auth_uri} --os-project-name ${keystone_project_name} --os-username ${keystone_username} --os-password ${keystone_password} list",
         # lint:endignore
       }
     }