summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Sullivan <bs3131@att.com>2016-02-10 20:13:14 -0800
committerblsaws <bs3131@att.com>2016-04-01 08:30:07 -0700
commitff5f6aac11aae2865715555bdd7f38ede38577e4 (patch)
tree1be164074b5cbab127d69f244dccffdc45e72554
parentd535c7d950d2ce4d8b4f34677aece32f5d6f3b85 (diff)
Add command echo to install scripts
JIRA: COPPER-2 Change-Id: I2e06785ea60528a29b5c9760683b2ccced7be91a Signed-off-by: Bryan Sullivan <bs3131@att.com>
-rw-r--r--components/congress/joid/install_congress_2.sh2
-rw-r--r--components/congress/joid/install_congress_3.sh4
-rw-r--r--components/congress/joid/install_congress_4.sh2
3 files changed, 6 insertions, 2 deletions
diff --git a/components/congress/joid/install_congress_2.sh b/components/congress/joid/install_congress_2.sh
index 01b1533..23e86e8 100644
--- a/components/congress/joid/install_congress_2.sh
+++ b/components/congress/joid/install_congress_2.sh
@@ -22,7 +22,9 @@
# 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 4507fed..321633b 100644
--- a/components/congress/joid/install_congress_3.sh
+++ b/components/congress/joid/install_congress_3.sh
@@ -26,7 +26,7 @@
# source ~/git/copper/components/congress/joid/install_congress_3.sh
cat <<EOF >~/env.sh
-export CONGRESS_HOST=192.168.10.118
+export CONGRESS_HOST=192.168.10.132
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 +38,4 @@ 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
-juju ssh ubuntu@$CONGRESS_HOST "source ~/install_congress_4.sh; exit"
+ssh ubuntu@$CONGRESS_HOST "source ~/install_congress_4.sh; exit"
diff --git a/components/congress/joid/install_congress_4.sh b/components/congress/joid/install_congress_4.sh
index c5a2714..ecfc999 100644
--- a/components/congress/joid/install_congress_4.sh
+++ b/components/congress/joid/install_congress_4.sh
@@ -26,6 +26,7 @@
# - 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
@@ -185,3 +186,4 @@ openstack congress datasource create keystone "keystone" \
# Run Congress Tempest Tests
cd ~/git/congress
# tox -epy27
+set -x #echo off