summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/congress/install/bash/clean_congress.sh4
-rw-r--r--components/congress/install/bash/install_congress_1.sh28
2 files changed, 29 insertions, 3 deletions
diff --git a/components/congress/install/bash/clean_congress.sh b/components/congress/install/bash/clean_congress.sh
index 05afe1f..a322dbe 100644
--- a/components/congress/install/bash/clean_congress.sh
+++ b/components/congress/install/bash/clean_congress.sh
@@ -29,6 +29,8 @@
echo "OS-specific prerequisite steps"
dist=`grep DISTRIB_ID /etc/*-release | awk -F '=' '{print $2}'`
+source ~/congress/env.sh
+
if [ "$dist" == "Ubuntu" ]; then
# Ubuntu
echo "Ubuntu-based install"
@@ -63,7 +65,7 @@ if [ "$CONGRESS_SERVICE" != "" ]; then
openstack service delete $CONGRESS_SERVICE
fi
-echo "Delete congress database"
+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"
diff --git a/components/congress/install/bash/install_congress_1.sh b/components/congress/install/bash/install_congress_1.sh
index 216e018..8f4676c 100644
--- a/components/congress/install/bash/install_congress_1.sh
+++ b/components/congress/install/bash/install_congress_1.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
# $ sh install_congress_1.sh [openstack-branch]
# optionally specifying the branch identifier to use for OpenStack
#
@@ -149,6 +149,30 @@ if [ $# -eq 1 ]; then git checkout $1; fi
pip install -r requirements.txt
pip install .
+echo "Install Glance client"
+cd ~/congress
+git clone https://github.com/openstack/python-glanceclient.git
+cd python-glanceclient
+if [ $# -eq 2 ]; then git checkout $2; fi
+pip install -r requirements.txt
+pip install .
+
+echo "Install Neutron client"
+cd ~/congress
+git clone https://github.com/openstack/python-neutronclient.git
+cd python-neutronclient
+if [ $# -eq 2 ]; then git checkout $2; fi
+pip install -r requirements.txt
+pip install .
+
+echo "Install Nova client"
+cd ~/congress
+git clone https://github.com/openstack/python-novaclient.git
+cd python-novaclient
+if [ $# -eq 2 ]; then git checkout $2; fi
+pip install -r requirements.txt
+pip install .
+
echo "setup Congress user. TODO: needs update in http://congress.readthedocs.org/en/latest/readme.html#installing-congress"
pip install cliff --upgrade
export ADMIN_ROLE=$(openstack role list | awk "/ admin / { print \$2 }")