Add cleanup script. Correct "set" commands.

JIRA: COPPER-4

Change-Id: Ia8f9dbd7b7439dd1117576979ac61b06547c396b
Signed-off-by: blsaws <bs3131@att.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/components/congress/test-webapp/setup/install_congress_testserver_1.sh b/components/congress/test-webapp/setup/install_congress_testserver_1.sh
index 0776ba3..50f6882 100644
--- a/components/congress/test-webapp/setup/install_congress_testserver_1.sh
+++ b/components/congress/test-webapp/setup/install_congress_testserver_1.sh
@@ -22,7 +22,7 @@
 # - ~/env.sh created as part of Congress install (install_congress_3.sh)
 # How to use:
 #   Install OPNFV per https://wiki.opnfv.org/copper/academy/joid
-#   $ source install_congress_testserver_1.sh
+#   $ source install_congress_testserver_1.sh <opnfv password>
 
 # Following are notes on creating a container as test driver for Congress. 
 # This is based upon an Ubuntu host as installed by JOID.
@@ -33,6 +33,7 @@
 # On the jumphost
 # Earlier versions of the JOID installer installed lxc and created local templates
 # but now we have to get the ubuntu template from the controller
+set -x 
 sudo apt-get install -y lxc
 juju scp ubuntu@node1-control:/usr/share/lxc/templates/lxc-ubuntu ~/lxc-ubuntu
 sudo cp ~/lxc-ubuntu /usr/share/lxc/templates/lxc-ubuntu
@@ -44,9 +45,13 @@ if (($? > 0)); then
 fi
 export COPPER_HOST=""
 while [ "$COPPER_HOST" == "" ]; do 
+  sleep 5
   export COPPER_HOST=$(sudo lxc-info --name trusty-copper | grep IP | awk "/ / { print \$2 }")
 done
 echo COPPER_HOST = $COPPER_HOST
 echo export COPPER_HOST=$COPPER_HOST >>~/env.sh
-ssh -t -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no opnfv@$COPPER_HOST "source ~/git/copper/components/congress/test-webapp/setup/install_congress_testserver_2.sh; exit"
+ssh -t -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no opnfv@$COPPER_HOST "source ~/git/copper/components/congress/test-webapp/setup/install_congress_testserver_2.sh; exit" <<EOF
+$1
+EOF
+set +x
 # </code>