From abb2b6f9008c7661aa0aaeb12a58aeba02106eaa Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 12 Jun 2017 04:44:45 -0400 Subject: Fixes vars missing in overcloudrc.v3 Change-Id: I03df4973fe2bb1356719dda5666484f556df2ffa Signed-off-by: Tim Rozet --- lib/post-install-functions.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh index a93ad541..b3bfbd6f 100755 --- a/lib/post-install-functions.sh +++ b/lib/post-install-functions.sh @@ -163,17 +163,17 @@ fi # Fix project_id and os_tenant_name not in overcloudrc # Deprecated openstack client does not need project_id # and os_tenant_name anymore but glance client and -# Rally in generall does need it. +# Rally in general does need it. # REMOVE when not needed in Rally/glance-client anymore. -if ! grep -q "OS_PROJECT_ID" ./overcloudrc;then - project_id=\$(openstack project list |grep admin|awk '{print \$2}') - echo "export OS_PROJECT_ID=\$project_id" >> ./overcloudrc -fi -if ! grep -q "OS_TENANT_NAME" ./overcloudrc;then - echo "export OS_TENANT_NAME=admin" >> ./overcloudrc -fi - - +for rcfile in overcloudrc overcloudrc.v3; do + if ! grep -q "OS_PROJECT_ID" \$rcfile; then + project_id=\$(openstack project list |grep admin|awk '{print \$2}') + echo "export OS_PROJECT_ID=\$project_id" >> \$rcfile + fi + if ! grep -q "OS_TENANT_NAME" \$rcfile; then + echo "export OS_TENANT_NAME=admin" >> \$rcfile + fi +done EOI # we need to restart neutron-server in Gluon deployments to allow the Gluon core -- cgit 1.2.3-korg