From c5abd71c01dfd2fcbb9bcde8180198a291f2e658 Mon Sep 17 00:00:00 2001 From: blsaws Date: Tue, 17 May 2016 16:49:29 -0700 Subject: Move all scripts etc under congress to simplify cleanup. JIRA: COPPER-2 Change-Id: I18b5ca707edaef67573bd5742084c7b2020b7564 Signed-off-by: blsaws --- .../congress/install/bash/centos/clean_congress.sh | 4 ++-- .../install/bash/centos/install_congress_1.sh | 25 +++++++++++----------- .../install/bash/centos/install_congress_2.sh | 7 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'components') diff --git a/components/congress/install/bash/centos/clean_congress.sh b/components/congress/install/bash/centos/clean_congress.sh index 4b5105c..27d6193 100644 --- a/components/congress/install/bash/centos/clean_congress.sh +++ b/components/congress/install/bash/centos/clean_congress.sh @@ -22,7 +22,7 @@ # Prequisite: # OPFNV install per https://wiki.opnfv.org/display/copper/Apex # How to use: -# cd ~/congress/copper/ (or wherever you cloned the copper repo) +# cd ~/git/copper/ # source /components/congress/install/bash/centos/clean_congress.sh cd ~ @@ -37,7 +37,7 @@ echo "Stop the Congress service" ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no heat-admin@$CONGRESS_HOST "pkill congress-server; exit" echo "Remove the Congress virtualenv and code" -ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no heat-admin@$CONGRESS_HOST "rm -rf ~/congress/congress; rm ~/admin-openrc.sh; rm ~/admin-openrc.sh; exit" +ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no heat-admin@$CONGRESS_HOST "rm -rf ~/congress; exit" # Setup env for overcloud API access source ~/overcloudrc diff --git a/components/congress/install/bash/centos/install_congress_1.sh b/components/congress/install/bash/centos/install_congress_1.sh index 4d465af..166f475 100644 --- a/components/congress/install/bash/centos/install_congress_1.sh +++ b/components/congress/install/bash/centos/install_congress_1.sh @@ -20,7 +20,7 @@ # On the jumphost, logged in as stack on the undercloud VM: # su stack # Clone the Copper repo and run the install script: -# git clone https://gerrit.opnfv.org/gerrit/copper +# mkdir ~/git; cd git; git clone https://gerrit.opnfv.org/gerrit/copper # cd copper # source components/congress/install/bash/centos/install_congress_1.sh @@ -36,7 +36,8 @@ export CONTROLLER_HOST1=$(openstack server list | awk "/overcloud-controller-0/ export CONTROLLER_HOST2=$(openstack server list | awk "/overcloud-controller-1/ { print \$8 }" | sed 's/ctlplane=//g') echo "Create the environment file and copy to the congress server" -cat <~/env.sh +mkdir ~/congress +cat <~/congress/env.sh export CONGRESS_HOST=$CONTROLLER_HOST1 export KEYSTONE_HOST=$CONTROLLER_HOST1 export CEILOMETER_HOST=$CONTROLLER_HOST1 @@ -45,22 +46,23 @@ export GLANCE_HOST=$CONTROLLER_HOST1 export NEUTRON_HOST=$CONTROLLER_HOST1 export NOVA_HOST=$CONTROLLER_HOST1 EOF -source ~/env.sh -scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ~/env.sh heat-admin@$CONTROLLER_HOST1:/home/heat-admin +source ~/congress/env.sh +scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ~/congress/env.sh heat-admin@$CONTROLLER_HOST1:/home/heat-admin -# Setup env for overcloud API access +# Setup env for overcloud API access and copy to congress server source ~/overcloudrc export OS_REGION_NAME=$(openstack endpoint list | awk "/ nova / { print \$4 }") -cp ~/overcloudrc ~/admin-openrc.sh +cp ~/overcloudrc ~/congress/admin-openrc.sh # sed command below is a workaound for a bug - region shows up twice for some reason -cat <>~/admin-openrc.sh +cat <>~/congress/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/ +ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no heat-admin@$CONTROLLER_HOST1 "mkdir ~/congress; exit" +scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ~/congress/admin-openrc.sh heat-admin@$CONTROLLER_HOST1:/home/heat-admin/congress echo "Copy install_congress_2.sh to the congress server and execute" -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" +scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ~/git/copper/components/congress/install/bash/centos/install_congress_2.sh heat-admin@$CONTROLLER_HOST1:/home/heat-admin/congress +ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no heat-admin@$CONTROLLER_HOST1 "source ~/congress/install_congress_2.sh; exit" echo "Install jumphost dependencies" @@ -72,7 +74,6 @@ 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 ~/congress cd ~/congress git clone https://github.com/openstack/congress.git cd congress @@ -83,7 +84,7 @@ virtualenv ~/congress/congress source bin/activate echo "Setup overcloud OpenStack API" -admin-openrc.sh +source ~/congress/admin-openrc.sh echo "Install OpenStack client" cd ~/congress diff --git a/components/congress/install/bash/centos/install_congress_2.sh b/components/congress/install/bash/centos/install_congress_2.sh index 19c7556..a41c4a5 100644 --- a/components/congress/install/bash/centos/install_congress_2.sh +++ b/components/congress/install/bash/centos/install_congress_2.sh @@ -20,13 +20,13 @@ # On the jumphost, logged in as stack on the undercloud VM: # su stack # Clone the Copper repo and run the install script: -# git clone https://gerrit.opnfv.org/gerrit/copper +# mkdir ~/git; cd git; git clone https://gerrit.opnfv.org/gerrit/copper # cd copper # source components/congress/install/bash/centos/install_congress_1.sh set -x -source ~/admin-openrc.sh -source ~/env.sh +source ~/congress/admin-openrc.sh +source ~/congress/env.sh echo "install pip" sudo yum install python-pip -y @@ -40,7 +40,6 @@ 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 ~/congress cd ~/congress git clone https://github.com/openstack/congress.git cd congress -- cgit 1.2.3-korg