From eb27b050e3729c6a89ded2c6d65d34be9470c320 Mon Sep 17 00:00:00 2001 From: blsaws Date: Thu, 18 Feb 2016 16:13:31 -0800 Subject: correct "set" commands. use "source" instead of "sh". add lxc-destroy to cleanup script. JIRA: COPPER-2 Change-Id: I3436ad4958405a71bc28ce4ed9b0a7ff0a596b6f Signed-off-by: blsaws --- components/congress/joid/clean_congress.sh | 13 ++++++++++--- components/congress/joid/install_congress_1.sh | 2 +- components/congress/joid/install_congress_2.sh | 2 ++ components/congress/joid/install_congress_3.sh | 6 ++++-- components/congress/joid/install_congress_4.sh | 3 +-- 5 files changed, 18 insertions(+), 8 deletions(-) (limited to 'components') diff --git a/components/congress/joid/clean_congress.sh b/components/congress/joid/clean_congress.sh index 4d8d7b7..2afc0b3 100644 --- a/components/congress/joid/clean_congress.sh +++ b/components/congress/joid/clean_congress.sh @@ -18,17 +18,24 @@ # LXC container in the OPNFV Controller node. # Presumably something has failed, and any record of the Congress feature # in OpenStack needs to be removed, so you can try the install again. -# Most of the items removed by this script were created in install_congress_5.sh source ~/admin-openrc.sh < 0)); then + return +fi cat <~/env.sh export CONGRESS_HOST=$1 export KEYSTONE_HOST=$(juju status --format=short | awk "/keystone\/0/ { print \$3 }") @@ -40,4 +43,3 @@ juju scp ~/admin-openrc.sh ubuntu@$CONGRESS_HOST:/home/ubuntu juju scp ~/env.sh ubuntu@$CONGRESS_HOST:/home/ubuntu juju scp ~/git/copper/components/congress/joid/install_congress_4.sh ubuntu@$CONGRESS_HOST:/home/ubuntu ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ubuntu@$CONGRESS_HOST "source ~/install_congress_4.sh; exit" -return diff --git a/components/congress/joid/install_congress_4.sh b/components/congress/joid/install_congress_4.sh index 3248bec..a96cc7a 100644 --- a/components/congress/joid/install_congress_4.sh +++ b/components/congress/joid/install_congress_4.sh @@ -45,7 +45,6 @@ sudo -E apt-get -q -y install mysql-server python-mysqldb sudo pip install virtualenvsource ~/admin-openrc.sh <