diff options
author | blsaws <bs3131@att.com> | 2016-02-18 16:13:31 -0800 |
---|---|---|
committer | blsaws <bs3131@att.com> | 2016-02-18 16:13:31 -0800 |
commit | b7c1cdc92dcdb60200273df44aeb852f89207de5 (patch) | |
tree | 7937321d19d5c2ef8970df0d247dc276aa9f966d /components/congress/joid/install_congress_3.sh | |
parent | 56db520ef9207574138e39e65600135a8222fe59 (diff) |
correct "set" commands. use "source" instead of "sh".
add lxc-destroy to cleanup script.
JIRA: COPPER-2
Change-Id: I3436ad4958405a71bc28ce4ed9b0a7ff0a596b6f
Signed-off-by: blsaws <bs3131@att.com>
Diffstat (limited to 'components/congress/joid/install_congress_3.sh')
-rw-r--r-- | components/congress/joid/install_congress_3.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/components/congress/joid/install_congress_3.sh b/components/congress/joid/install_congress_3.sh index bf3b31e..6f094fb 100644 --- a/components/congress/joid/install_congress_3.sh +++ b/components/congress/joid/install_congress_3.sh @@ -25,7 +25,10 @@ # - Congress server IP address as discovered in lxc-info above # source ~/git/copper/components/congress/joid/install_congress_3.sh -ssh-keygen -f "/home/opnfv/.ssh/known_hosts" -R $1 +#ssh-keygen -f "/home/opnfv/.ssh/known_hosts" -R $1 +if (($? > 0)); then + return +fi cat <<EOF >~/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 |