summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblsaws <bryan.sullivan@att.com>2016-05-22 14:10:06 -0700
committerblsaws <bryan.sullivan@att.com>2016-05-22 14:10:06 -0700
commitba20dd6024489d6a452c52a0a09d8b8e98031b4e (patch)
tree1ef69f8cac308519a0f8a16b785125fa4868cbd3
parentcf9200bf649017f2428f42717ca7fbe44334009b (diff)
Fix a few bugs in testing. Drop database on cleanup.
JIRA: COPPER-2 Change-Id: I8ccc48addf181e0d29c7bc65a104a97cbec63929 Signed-off-by: blsaws <bryan.sullivan@att.com>
-rw-r--r--components/congress/install/bash/clean_congress.sh5
-rw-r--r--components/congress/install/bash/install_congress_1.sh4
-rw-r--r--components/congress/install/bash/install_congress_2.sh4
3 files changed, 8 insertions, 5 deletions
diff --git a/components/congress/install/bash/clean_congress.sh b/components/congress/install/bash/clean_congress.sh
index 59a2b5f..05afe1f 100644
--- a/components/congress/install/bash/clean_congress.sh
+++ b/components/congress/install/bash/clean_congress.sh
@@ -24,7 +24,7 @@
# - For JOID installs, admin-openrc.sh saved from Horizon to ~/admin-openrc.sh
# - Retrieve the copper remova script as below
# $ cd ~
-# $ wget https://git.opnfv.org/cgit/copper/tree/components/congress/install/bash/clean_congress.sh
+# $ wget https://git.opnfv.org/cgit/copper/plain/components/congress/install/bash/clean_congress.sh
echo "OS-specific prerequisite steps"
dist=`grep DISTRIB_ID /etc/*-release | awk -F '=' '{print $2}'`
@@ -63,6 +63,9 @@ if [ "$CONGRESS_SERVICE" != "" ]; then
openstack service delete $CONGRESS_SERVICE
fi
+echo "Delete congress database"
+ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $CTLUSER@$CONGRESS_HOST "sudo mysql -e \"DROP DATABASE congress\"; exit"
+
echo "Deactivate virtualenv"
deactivate
diff --git a/components/congress/install/bash/install_congress_1.sh b/components/congress/install/bash/install_congress_1.sh
index 4190173..216e018 100644
--- a/components/congress/install/bash/install_congress_1.sh
+++ b/components/congress/install/bash/install_congress_1.sh
@@ -25,7 +25,7 @@
# $ cd ~
# $ wget https://git.opnfv.org/cgit/copper/tree/components/congress/install/bash/install_congress_1.sh
# $ wget https://git.opnfv.org/cgit/copper/tree/components/congress/install/bash/install_congress_2.sh
-# $ source install_congress_1.sh [openstack-branch]
+# $ sh install_congress_1.sh [openstack-branch]
# optionally specifying the branch identifier to use for OpenStack
#
@@ -100,7 +100,7 @@ EOF
# sed command below is a workaound for a bug - region shows up twice for some reason
cat <<EOF | sed '$d' >>~/admin-openrc.sh
export OS_REGION_NAME=$OS_REGION_NAME
-EOFif [ "$dist" == "Ubuntu" ]; then
+EOF
scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ~/admin-openrc.sh $CTLUSER@$CONTROLLER_HOST1:/home/$CTLUSER/congress
echo "Copy install_congress_2.sh to the congress server and execute"
scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ~/install_congress_2.sh $CTLUSER@$CONTROLLER_HOST1:/home/$CTLUSER/congress
diff --git a/components/congress/install/bash/install_congress_2.sh b/components/congress/install/bash/install_congress_2.sh
index b4b129d..f2065b8 100644
--- a/components/congress/install/bash/install_congress_2.sh
+++ b/components/congress/install/bash/install_congress_2.sh
@@ -23,8 +23,8 @@
# - Retrieve the copper install script as below, optionally specifying the
# branch to use as a URL parameter, e.g. ?h=stable%2Fbrahmaputra
# $ cd ~
-# $ wget https://git.opnfv.org/cgit/copper/tree/components/congress/install/bash/install_congress_1.sh
-# $ wget https://git.opnfv.org/cgit/copper/tree/components/congress/install/bash/install_congress_2.sh
+# $ wget https://git.opnfv.org/cgit/copper/plain/components/congress/install/bash/install_congress_1.sh
+# $ wget https://git.opnfv.org/cgit/copper/plain/components/congress/install/bash/install_congress_2.sh
# $ source install_congress_1.sh [openstack-branch]
# optionally specifying the branch identifier to use for OpenStack
#