diff options
author | 2016-06-14 13:39:53 -0700 | |
---|---|---|
committer | 2016-06-14 13:39:53 -0700 | |
commit | 79b6ffd37b153558a8ef9172137842041439cb9f (patch) | |
tree | 916de962e00eb399edb9e90e9d9bd85eb8e11967 /components/congress/install | |
parent | c4f488ed136d875e6cbe2454b10caef0d1285cd2 (diff) |
Fixes to test web server
JIRA: COPPER-4
Change-Id: Icfe6cba0cbe15122d4edf28c672aff0b5711d0b5
Signed-off-by: blsaws <bryan.sullivan@att.com>
Diffstat (limited to 'components/congress/install')
-rw-r--r-- | components/congress/install/bash/setenv.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/components/congress/install/bash/setenv.sh b/components/congress/install/bash/setenv.sh index 0997345..60065ba 100644 --- a/components/congress/install/bash/setenv.sh +++ b/components/congress/install/bash/setenv.sh @@ -22,6 +22,8 @@ # $ wget https://git.opnfv.org/cgit/copper/plain/components/congress/install/bash/setenv.sh # $ bash setenv.sh +if [ ! -d /tmp/copper ]; then mkdir /tmp/copper; fi + dist=`grep DISTRIB_ID /etc/*-release | awk -F '=' '{print $2}'` if [ "$dist" == "Ubuntu" ]; then @@ -29,7 +31,7 @@ if [ "$dist" == "Ubuntu" ]; then echo "Ubuntu-based install" echo "Create the environment file" KEYSTONE_HOST=$(juju status --format=short | awk "/keystone\/0/ { print \$3 }") - cat <<EOF >~/env.sh + cat <<EOF >/tmp/copper/env.sh export CONGRESS_HOST=$(juju status --format=short | awk "/openstack-dashboard/ { print \$3 }") export HORIZON_HOST=$(juju status --format=short | awk "/openstack-dashboard/ { print \$3 }") export KEYSTONE_HOST=$KEYSTONE_HOST @@ -52,7 +54,7 @@ else echo "Get address of Controller node" export CONTROLLER_HOST1=$(openstack server list | awk "/overcloud-controller-0/ { print \$8 }" | sed 's/ctlplane=//g') echo "Create the environment file" - cat <<EOF >~/env.sh + cat <<EOF >/tmp/copper/env.sh export CONGRESS_HOST=$CONTROLLER_HOST1 export KEYSTONE_HOST=$CONTROLLER_HOST1 export CEILOMETER_HOST=$CONTROLLER_HOST1 @@ -61,13 +63,13 @@ export GLANCE_HOST=$CONTROLLER_HOST1 export NEUTRON_HOST=$CONTROLLER_HOST1 export NOVA_HOST=$CONTROLLER_HOST1 EOF - cat ~/overcloudrc >>~/env.sh + cat ~/overcloudrc >>/tmp/copper/env.sh source ~/overcloudrc export OS_REGION_NAME=$(openstack endpoint list | awk "/ nova / { print \$4 }") # sed command below is a workaound for a bug - region shows up twice for some reason - cat <<EOF | sed '$d' >>~/env.sh + cat <<EOF | sed '$d' >>/tmp/copper/env.sh export OS_REGION_NAME=$OS_REGION_NAME EOF fi -source ~/env.sh +source /tmp/copper/env.sh |