From 345cf9dcc19dc83c1dce55259ccfdde6107309da Mon Sep 17 00:00:00 2001 From: blsaws Date: Tue, 17 May 2016 16:26:54 -0700 Subject: Fixes for manual install testing phase. JIRA: COPPER-2 Change-Id: Ia3eb86248c7fa4ad98789615d669c4571366f634 Signed-off-by: blsaws --- .../congress/install/bash/centos/clean_congress.sh | 39 ++++++++++----- .../install/bash/centos/install_congress_1.sh | 58 ++++++++++++---------- .../install/bash/centos/install_congress_2.sh | 13 ++--- .../test-webapp/setup/clean_congress_testserver.sh | 0 .../setup/restart_congress_testserver.sh | 0 5 files changed, 64 insertions(+), 46 deletions(-) mode change 100644 => 100755 components/congress/test-webapp/setup/clean_congress_testserver.sh mode change 100644 => 100755 components/congress/test-webapp/setup/restart_congress_testserver.sh (limited to 'components') diff --git a/components/congress/install/bash/centos/clean_congress.sh b/components/congress/install/bash/centos/clean_congress.sh index 4ab21a4..4b5105c 100644 --- a/components/congress/install/bash/centos/clean_congress.sh +++ b/components/congress/install/bash/centos/clean_congress.sh @@ -13,23 +13,34 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# This is a cleanup script for installation of Congress on an Ubuntu 14.04 -# LXC container in the OPNFV Controller node. +# This is a cleanup script for installation of Congress on the Centos 7 based +# OPNFV Controller node as installed per the OPNFV Apex project. +# Prequisites: # Presumably something has failed, and any record of the Congress feature # in OpenStack needs to be removed, so you can try the install again. # -# Prequisite: OPFNV install per https://wiki.opnfv.org/copper/academy/joid +# Prequisite: +# OPFNV install per https://wiki.opnfv.org/display/copper/Apex # How to use: -# Install OPNFV per https://wiki.opnfv.org/copper/academy/joid -# $ source ~/git/copper/components/congress/joid/clean_congress.sh -# is the name of the controller node in MAAS. +# cd ~/congress/copper/ (or wherever you cloned the copper repo) +# source /components/congress/install/bash/centos/clean_congress.sh -source ~/admin-openrc.sh <>~/admin-openrc.sh +export OS_REGION_NAME=$OS_REGION_NAME +EOF +scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ~/admin-openrc.sh heat-admin@$CONTROLLER_HOST1:/home/heat-admin/ echo "Copy install_congress_2.sh to the congress server and execute" -scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ~/git/copper/components/congress/joid/install_congress_2.sh heat-admin@$CONTROLLER_HOST1:/home/heat-admin +scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ~/congress/copper/components/congress/install/bash/centos/install_congress_2.sh heat-admin@$CONTROLLER_HOST1:/home/heat-admin ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no heat-admin@$CONTROLLER_HOST1 "source ~/install_congress_2.sh; exit" echo "Install jumphost dependencies" @@ -70,41 +72,43 @@ sudo yum install apg git gcc libxml2 python-devel libzip-devel libxslt-devel -y sudo pip install --upgrade pip virtualenv setuptools pbr tox echo "Clone congress" -mkdir ~/git -cd ~/git +mkdir ~/congress +cd ~/congress git clone https://github.com/openstack/congress.git cd congress git checkout stable/liberty echo "Create virtualenv" -virtualenv ~/git/congress +virtualenv ~/congress/congress source bin/activate -echo "Install and test OpenStack client" -cd ~/git +echo "Setup overcloud OpenStack API" +admin-openrc.sh + +echo "Install OpenStack client" +cd ~/congress git clone https://github.com/openstack/python-openstackclient.git cd python-openstackclient git checkout stable/liberty -~/git/congress/bin/pip install -r requirements.txt -~/git/congress/bin/pip install . +~/congress/congress/bin/pip install -r requirements.txt +~/congress/congress/bin/pip install . openstack service list -echo "Install and test Congress client" -cd ~/git +echo "Install Congress client" +cd ~/congress git clone https://github.com/openstack/python-congressclient.git cd python-congressclient git checkout stable/liberty -~/git/congress/bin/pip install -r requirements.txt -~/git/congress/bin/pip install . -openstack congress driver list +~/congress/congress/bin/pip install -r requirements.txt +~/congress/congress/bin/pip install . -echo "Install and test Keystone client" -cd ~/git +echo "Install Keystone client" +cd ~/congress git clone https://github.com/openstack/python-keystoneclient.git cd python-keystoneclient git checkout stable/liberty -~/git/congress/bin/pip install -r requirements.txt -~/git/congress/bin/pip install . +~/congress/congress/bin/pip install -r requirements.txt +~/congress/congress/bin/pip install . echo "setup Congress user. TODO: needs update in http://congress.readthedocs.org/en/latest/readme.html#installing-congress" pip install cliff --upgrade @@ -126,7 +130,7 @@ openstack endpoint create $CONGRESS_SERVICE \ --internalurl http://$CONGRESS_HOST:1789/ echo "Start the Congress service" -ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no heat-admin@$CONGRESS_HOST "~/git/congress/bin/congress-server &>/dev/null &" +ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no heat-admin@$CONGRESS_HOST "~/congress/congress/bin/congress-server &>/dev/null &" echo "Wait 30 seconds for Congress service to startup" sleep 30 @@ -168,7 +172,7 @@ echo "Install tox test dependencies" sudo yum install -y libffi-devel openssl-devel echo "Run Congress tox Tests" -cd ~/git/congress +cd ~/congress/congress tox -epy27 set +x #echo off diff --git a/components/congress/install/bash/centos/install_congress_2.sh b/components/congress/install/bash/centos/install_congress_2.sh index e98ca9b..19c7556 100644 --- a/components/congress/install/bash/centos/install_congress_2.sh +++ b/components/congress/install/bash/centos/install_congress_2.sh @@ -21,7 +21,8 @@ # su stack # Clone the Copper repo and run the install script: # git clone https://gerrit.opnfv.org/gerrit/copper -# source copper/components/install/bash/centos/install_congress_1.sh +# cd copper +# source components/congress/install/bash/centos/install_congress_1.sh set -x source ~/admin-openrc.sh @@ -39,14 +40,14 @@ sudo yum install apg git gcc libxml2 python-devel libzip-devel libxslt-devel -y sudo pip install --upgrade pip virtualenv setuptools pbr tox echo "Clone congress" -mkdir ~/git -cd ~/git +mkdir ~/congress +cd ~/congress git clone https://github.com/openstack/congress.git cd congress git checkout stable/liberty echo "Create virtualenv" -virtualenv ~/git/congress +virtualenv ~/congress/congress source bin/activate echo "Setup Congress" @@ -62,7 +63,7 @@ echo "install requirements.txt and tox dependencies (detected by errors during ' sudo yum install libffi-devel openssl openssl-devel -y echo "install dependencies of Congress" -cd ~/git/congress +cd ~/congress/congress bin/pip install -r requirements.txt bin/pip install . @@ -101,7 +102,7 @@ echo "create database schema" congress-db-manage --config-file /etc/congress/congress.conf upgrade head echo "Install Congress client" -cd ~/git +cd ~/congress git clone https://github.com/openstack/python-congressclient.git cd python-congressclient git checkout stable/liberty diff --git a/components/congress/test-webapp/setup/clean_congress_testserver.sh b/components/congress/test-webapp/setup/clean_congress_testserver.sh old mode 100644 new mode 100755 diff --git a/components/congress/test-webapp/setup/restart_congress_testserver.sh b/components/congress/test-webapp/setup/restart_congress_testserver.sh old mode 100644 new mode 100755 -- cgit 1.2.3-korg