x/packstack
Code Issues Proposed changes

Remove redundant spaces from rc files

Browse Source 
Change-Id: I2158e9d8c859daeca9944b2213bdaad22eb2f054
This commit is contained in:
Takashi Kajinami 2024-07-12 17:52:52 +09:00
parent 99cc91ff93
commit e34380385d
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packstack/puppet/modules/packstack/manifests/openstackclient.pp
View File

@ -25,17 +25,17 @@ class packstack::openstackclient ()
}
$rcadmin_common_content = "unset OS_SERVICE_TOKEN
export OS_USERNAME=${ost_cl_keystone_admin_username}
export OS_PASSWORD='${ost_cl_keystone_admin_pw}'
export OS_REGION_NAME=${ost_cl_keystone_region}
export OS_AUTH_URL=${ost_cl_ctrl_keystone_url}
export PS1='[\\u@\\h \\W(keystone_admin)]\\$ '
"
export OS_USERNAME=${ost_cl_keystone_admin_username}
export OS_PASSWORD='${ost_cl_keystone_admin_pw}'
export OS_REGION_NAME=${ost_cl_keystone_region}
export OS_AUTH_URL=${ost_cl_ctrl_keystone_url}
export PS1='[\\u@\\h \\W(keystone_admin)]\\$ '
"
if $int_api_version < 3 {
$rcadmin_content = "${rcadmin_common_content}
export OS_TENANT_NAME=admin
"
"
}
else {
$rcadmin_content = "${rcadmin_common_content}
@ -43,7 +43,7 @@ export OS_PROJECT_NAME=admin
export OS_USER_DOMAIN_NAME=Default
export OS_PROJECT_DOMAIN_NAME=Default
export OS_IDENTITY_API_VERSION=${int_api_version}
"
"
}
file { "${::home_dir}/keystonerc_admin":
@ -58,20 +58,20 @@ export OS_USERNAME=demo
export OS_PASSWORD='${ost_cl_keystone_demo_pw}'
export PS1='[\\u@\\h \\W(keystone_demo)]\\$ '
export OS_AUTH_URL=${ost_cl_ctrl_keystone_url}
"
"
if $int_api_version < 3 {
$demo_content = "${demo_common_content}
export OS_TENANT_NAME=demo
export OS_IDENTITY_API_VERSION=${int_api_version}.0
"
"
} else {
$demo_content = "${demo_common_content}
export OS_PROJECT_NAME=demo
export OS_USER_DOMAIN_NAME=Default
export OS_PROJECT_DOMAIN_NAME=Default
export OS_IDENTITY_API_VERSION=${int_api_version}
"
"
}
file { "${::home_dir}/keystonerc_demo":