diff options
| author |   Bryan Sullivan <bryan.sullivan@att.com> | 2016-12-07 05:41:52 -0800 |
|---|---|---|
| committer | Bryan Sullivan <bryan.sullivan@att.com> | 2016-12-07 05:43:11 -0800 |
| commit | 1eb8479dfb8ba6d3d908ed85131c67cc3b6d1058 (patch) | |
| tree | 50a4bc47b8b527019704381743b5df23088e40aa /components | |
| parent | a6b4e3954814582d79ceae537030d32932e8e8e1 (diff) | |
Correct ref to congress server in juju command
JIRA: COPPER-2
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
Small changes to smoke01 test
Change-Id: Ie1783671ba4b418c45cdbd4447538728ce9fff49
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
Diffstat (limited to 'components')
| -rw-r--r-- | components/congress/install/bash/setenv.sh | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | components/congress/test-webapp/setup/clean_congress_testserver.sh | 0 | ||||
| -rw-r--r-- | components/congress/test-webapp/setup/install_congress_testserver.sh | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | components/congress/test-webapp/setup/restart_congress_testserver.sh | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/components/congress/install/bash/setenv.sh b/components/congress/install/bash/setenv.sh index 11bd460..17cfe93 100644 --- a/components/congress/install/bash/setenv.sh +++ b/components/congress/install/bash/setenv.sh @@ -32,7 +32,7 @@ if [ "$dist" == "Ubuntu" ]; then echo "Create the environment file" KEYSTONE_HOST=$(juju status --format=short | awk "/keystone\/0/ { print \$3 }") cat <<EOF >/tmp/copper/env.sh -export CONGRESS_HOST=$(juju status --format=short | awk "/openstack-dashboard/ { print \$3 }") +export CONGRESS_HOST=$(juju status --format=short | awk "/congress\/0/ { print \$3 }") export HORIZON_HOST=$(juju status --format=short | awk "/openstack-dashboard/ { print \$3 }") export KEYSTONE_HOST=$KEYSTONE_HOST export CEILOMETER_HOST=$(juju status --format=short | awk "/ceilometer\/0/ { print \$3 }") diff --git a/components/congress/test-webapp/setup/clean_congress_testserver.sh b/components/congress/test-webapp/setup/clean_congress_testserver.sh index fb033e9..fb033e9 100755..100644 --- a/components/congress/test-webapp/setup/clean_congress_testserver.sh +++ b/components/congress/test-webapp/setup/clean_congress_testserver.sh diff --git a/components/congress/test-webapp/setup/install_congress_testserver.sh b/components/congress/test-webapp/setup/install_congress_testserver.sh index e720184..a16d1be 100644 --- a/components/congress/test-webapp/setup/install_congress_testserver.sh +++ b/components/congress/test-webapp/setup/install_congress_testserver.sh @@ -95,8 +95,8 @@ sed -i -- "s/OS_PASSWORD/$OS_PASSWORD/g" /tmp/copper/copper/components/congress/ echo "Start webapp container" sudo docker build -t copper-webapp /tmp/copper/copper/components/congress/test-webapp/ -CID=$(sudo docker run -v /tmp/copper/log:/tmp -p 8257:80 -d copper-webapp) -CIP=$(sudo docker inspect $CID | grep IPAddress | cut -d '"' -f 4 | tail -1) +sudo docker run -d -v /tmp/copper/log:/tmp -p 8257:80 --name copper copper-webapp +CIP=$(sudo docker inspect copper | grep IPAddress | cut -d '"' -f 4 | tail -1) echo "Copper Webapp IP address: $CIP" set +x diff --git a/components/congress/test-webapp/setup/restart_congress_testserver.sh b/components/congress/test-webapp/setup/restart_congress_testserver.sh index 97e585b..97e585b 100755..100644 --- a/components/congress/test-webapp/setup/restart_congress_testserver.sh +++ b/components/congress/test-webapp/setup/restart_congress_testserver.sh |