diff options
| author |   blsaws <bryan.sullivan@att.com> | 2016-03-14 17:02:13 -0700 |
|---|---|---|
| committer |   blsaws <bs3131@att.com> | 2016-04-01 08:30:07 -0700 |
| commit | f5fa6c71842c83063cd8d74e1747aa18811ca186 (patch) | |
| tree | 0f6b1cf0a457bf8c4640eb167e58b9e07d5a9349 | |
| parent | b3910790ad6b1a5d9a54e1ee8a1a00de85ff172e (diff) | |
Correct install comments and setup of CONGRESS_HOST variable
JIRA: COPPER-4
Change-Id: I302f0f4e7c701bfb37c6dea29630f816a94b6581
Signed-off-by: blsaws <bryan.sullivan@att.com>
| -rw-r--r-- | components/congress/test-webapp/setup/install_congress_testserver_1.sh | 15 | ||||
| -rw-r--r-- | components/congress/test-webapp/setup/install_congress_testserver_2.sh | 3 |
2 files changed, 7 insertions, 11 deletions
diff --git a/components/congress/test-webapp/setup/install_congress_testserver_1.sh b/components/congress/test-webapp/setup/install_congress_testserver_1.sh index 9e9001e..154185f 100644 --- a/components/congress/test-webapp/setup/install_congress_testserver_1.sh +++ b/components/congress/test-webapp/setup/install_congress_testserver_1.sh @@ -18,20 +18,14 @@ # # Prequisite: OPFNV install per https://wiki.opnfv.org/copper/academy/joid # On jumphost: -# - Congress installed through install_congress_1/2/3/4.sh -# - ~/env.sh created as part of Congress install (install_congress_3.sh) +# - Congress installed through install_congress_1.sh +# - ~/env.sh created as part of Congress install (install_congress_1.sh) # How to use: -# Install OPNFV per https://wiki.opnfv.org/copper/academy/joid # $ source install_congress_testserver_1.sh <controller_hostname> <user> # <controller_hostname> is the name of the controller node in MAAS # and <user> is the name of the account where you are installing this -# Following are notes on creating a container as test driver for Congress. -# This is based upon an Ubuntu host as installed by JOID. - -# === Create and Activate the Container === - -# On the jumphost +# Create and Activate the Container # Earlier versions of the JOID installer installed lxc and created local templates # but now we have to get the ubuntu template from the controller set -x @@ -46,6 +40,9 @@ if (($? > 0)); then return fi +# Get the CONGRESS_HOST value from env.sh +source ~/env.sh + # Get the copper server address sleep 5 export COPPER_HOST="" diff --git a/components/congress/test-webapp/setup/install_congress_testserver_2.sh b/components/congress/test-webapp/setup/install_congress_testserver_2.sh index bf01b74..75ee060 100644 --- a/components/congress/test-webapp/setup/install_congress_testserver_2.sh +++ b/components/congress/test-webapp/setup/install_congress_testserver_2.sh @@ -18,9 +18,8 @@ # # Prequisite: OPFNV install per https://wiki.opnfv.org/copper/academy/joid # On jumphost: -# - Congress installed through install_congress_1/2.sh +# - Congress installed through install_congress_1.sh # How to use: -# Install OPNFV per https://wiki.opnfv.org/copper/academy/joid # $ source ~/git/copper/tests/setup/install_congress_testserver_1.sh # Setup OpenStack environment variables per your OPNFV install |