summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorblsaws <bs3131@att.com>2016-02-18 16:15:51 -0800
committerblsaws <bs3131@att.com>2016-04-01 08:30:07 -0700
commit72a27448ab0eff5bbdbe56c1f13a5e855dcde0be (patch)
treee6ce1cf325cf81ba3f1b6012d96798c7cbddaf4a /components
parenteb27b050e3729c6a89ded2c6d65d34be9470c320 (diff)
Add cleanup script. Correct "set" commands.
JIRA: COPPER-4 Change-Id: Ia8f9dbd7b7439dd1117576979ac61b06547c396b Signed-off-by: blsaws <bs3131@att.com>
Diffstat (limited to 'components')
-rw-r--r--components/congress/test-webapp/setup/clean_congress_testserver.sh30
-rw-r--r--components/congress/test-webapp/setup/install_congress_testserver_1.sh9
-rw-r--r--components/congress/test-webapp/setup/install_congress_testserver_2.sh4
3 files changed, 39 insertions, 4 deletions
diff --git a/components/congress/test-webapp/setup/clean_congress_testserver.sh b/components/congress/test-webapp/setup/clean_congress_testserver.sh
new file mode 100644
index 0000000..cdda9dd
--- /dev/null
+++ b/components/congress/test-webapp/setup/clean_congress_testserver.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+# Copyright 2015-2016 Open Platform for NFV Project, Inc. and its contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This is a cleanup script for installation of the Congress testserver
+# on an Ubuntu 14.04 LXC container in the jumphost.
+# Presumably something has failed, and any record of the testserver
+# needs to be removed, so you can try the install again.
+
+source ~/admin-openrc.sh <<EOF
+openstack
+EOF
+source ~/env.sh
+set -x
+sudo lxc-stop --name trusty-copper
+sudo lxc-destroy --name trusty-copper
+rm -rf ~/coppertest
+set +x
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>
diff --git a/components/congress/test-webapp/setup/install_congress_testserver_2.sh b/components/congress/test-webapp/setup/install_congress_testserver_2.sh
index d877d68..01c9ce1 100644
--- a/components/congress/test-webapp/setup/install_congress_testserver_2.sh
+++ b/components/congress/test-webapp/setup/install_congress_testserver_2.sh
@@ -48,7 +48,7 @@ EOF
# Install and test OpenStack client
mkdir ~/coppertest
mkdir ~/coppertest/git
-cd git
+cd ~/coppertest/git
git clone https://github.com/openstack/python-openstackclient.git
cd python-openstackclient
git checkout stable/liberty
@@ -107,7 +107,7 @@ sudo pip install .
# <code>
# Clone Copper (if not already cloned in user home)
cd ~/coppertest/git
-if [ ! -d ~/coppertest/git/copper ]; then git clone https://gerrit.opnfv.org/gerrit/copper; fi
+git clone https://gerrit.opnfv.org/gerrit/copper
# Install Apache, PHP
sudo apt-get install -y apache2 php5 libapache2-mod-php5