From 209ed8d9138bbed5f3b61c50356c44bbf6ecc2c4 Mon Sep 17 00:00:00 2001 From: blsaws Date: Tue, 24 May 2016 10:35:07 -0700 Subject: Fix bugs found in cleanup testing JIRA: COPPER-2 Change-Id: Ia8004db849bf6fc1384d4bb9735b6f073c6328e4 Signed-off-by: blsaws --- components/congress/install/bash/install_congress_1.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'components/congress/install/bash/install_congress_1.sh') diff --git a/components/congress/install/bash/install_congress_1.sh b/components/congress/install/bash/install_congress_1.sh index 423e887..f7fa442 100644 --- a/components/congress/install/bash/install_congress_1.sh +++ b/components/congress/install/bash/install_congress_1.sh @@ -72,7 +72,6 @@ EOF sed -i -- 's/echo/#echo/g' ~/admin-openrc.sh sed -i -- 's/read -sr OS_PASSWORD_INPUT/#read -sr OS_PASSWORD_INPUT/g' ~/admin-openrc.sh sed -i -- 's/$OS_PASSWORD_INPUT/openstack/g' ~/admin-openrc.sh - cp ~/admin-openrc.sh ~/congress else # Centos echo "Centos-based install" @@ -96,8 +95,8 @@ EOF scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ~/congress/env.sh $CTLUSER@$CONTROLLER_HOST1:/home/$CTLUSER/congress echo "Setup env for overcloud API access and copy to congress server" source ~/overcloudrc + cp ~/overcloudrc ~/admin-openrc.sh export OS_REGION_NAME=$(openstack endpoint list | awk "/ nova / { print \$4 }") - cp ~/overcloudrc ~/congress/admin-openrc.sh # sed command below is a workaound for a bug - region shows up twice for some reason cat <>~/admin-openrc.sh export OS_REGION_NAME=$OS_REGION_NAME -- cgit 1.2.3-korg