diff options
| author |   blsaws <bs3131@att.com> | 2016-02-17 15:32:07 -0800 |
|---|---|---|
| committer | blsaws <bs3131@att.com> | 2016-04-01 08:30:07 -0700 |
| commit | 481e007a8ef5a4ffcd24d29a011c885b4955ab3f (patch) | |
| tree | 25a36cfc9e5a8ead73b093ac20cdf8d341ef7097 | |
| parent | 8c5d8a87f57405781810960d508d9ed7920e7ffb (diff) | |
Add return to force script close on exit.
Add "-x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
to ssh commands and remove "set -x" ("ssh -x" replaces it).
JIRA: COPPER-2
Change-Id: Iad5048adc52c293b9d2ddadca14555d7831f4f11
Signed-off-by: blsaws <bs3131@att.com>
| -rw-r--r-- | components/congress/joid/install_congress_1.sh | 3 | ||||
| -rw-r--r-- | components/congress/joid/install_congress_2.sh | 2 | ||||
| -rw-r--r-- | components/congress/joid/install_congress_3.sh | 8 | ||||
| -rw-r--r-- | components/congress/joid/install_congress_4.sh | 3 |
4 files changed, 8 insertions, 8 deletions
diff --git a/components/congress/joid/install_congress_1.sh b/components/congress/joid/install_congress_1.sh index ec0cd83..9b9d64d 100644 --- a/components/congress/joid/install_congress_1.sh +++ b/components/congress/joid/install_congress_1.sh @@ -24,4 +24,5 @@ # next: see install_congress_3.sh juju scp ~/git/copper/components/congress/joid/install_congress_2.sh ubuntu@node1-control:/home/ubuntu -juju ssh ubuntu@node1-control "source ~/install_congress_2.sh; exit" +juju ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ubuntu@node1-control "source ~/install_congress_2.sh; exit" +return diff --git a/components/congress/joid/install_congress_2.sh b/components/congress/joid/install_congress_2.sh index 23e86e8..01b1533 100644 --- a/components/congress/joid/install_congress_2.sh +++ b/components/congress/joid/install_congress_2.sh @@ -22,9 +22,7 @@ # source ~/git/copper/components/congress/joid/install_congress_1.sh # (copies install_congress_2.sh to node1-control and executes it) -set -x #echo on sudo lxc-clone -o juju-trusty-lxc-template -n juju-trusty-congress sudo lxc-start -n juju-trusty-congress -d sleep 10 sudo lxc-info -n juju-trusty-congress -set -x #echo off diff --git a/components/congress/joid/install_congress_3.sh b/components/congress/joid/install_congress_3.sh index 321633b..bf3b31e 100644 --- a/components/congress/joid/install_congress_3.sh +++ b/components/congress/joid/install_congress_3.sh @@ -23,10 +23,11 @@ # (copies install_congress_2.sh to node1-control and executes it) # Edit install_congress_3.sh with the congress host address from lxc_info # - Congress server IP address as discovered in lxc-info above -# source ~/git/copper/components/congress/joid/install_congress_3.sh +# source ~/git/copper/components/congress/joid/install_congress_3.sh +ssh-keygen -f "/home/opnfv/.ssh/known_hosts" -R $1 cat <<EOF >~/env.sh -export CONGRESS_HOST=192.168.10.132 +export CONGRESS_HOST=$1 export KEYSTONE_HOST=$(juju status --format=short | awk "/keystone\/0/ { print \$3 }") export CEILOMETER_HOST=$(juju status --format=short | awk "/ceilometer\/0/ { print \$3 }") export CINDER_HOST=$(juju status --format=short | awk "/cinder\/0/ { print \$3 }") @@ -38,4 +39,5 @@ source ~/env.sh 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 ubuntu@$CONGRESS_HOST "source ~/install_congress_4.sh; exit" +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 fb5c351..3248bec 100644 --- a/components/congress/joid/install_congress_4.sh +++ b/components/congress/joid/install_congress_4.sh @@ -26,7 +26,6 @@ # - Congress server IP address as discovered in lxc-info above # source ~/git/copper/components/congress/joid/install_congress_3.sh -set -x #echo on source ~/admin-openrc.sh <<EOF openstack EOF @@ -187,4 +186,4 @@ openstack congress datasource create keystone "keystone" \ # Run Congress Tempest Tests cd ~/git/congress # tox -epy27 -set -x #echo off + |