openstack/puppet-cinder
Code Issues Proposed changes

Use new naming for authtoken variables

Browse Source 
change old pattern tenant for project_name
drop _real suffix

Change-Id: I7bc232caedecfebf7ebe00923eff515e3c43b0c5
This commit is contained in:
Iury Gregory Melo Ferreira 2016-11-15 23:48:41 -03:00
parent ee082367f8
commit cce5e697f9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/api.pp
View File

@ -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
}
}