From 8b3949dfb2faa79567e790fcb2d523a3b3e979a6 Mon Sep 17 00:00:00 2001 From: blsaws Date: Mon, 14 Mar 2016 13:51:31 -0700 Subject: Change test object names to avoid conflicts. JIRA: COPPER-4 Change-Id: I206f4bdfc87729461cfd15d304e3214f9ff4cd13 Signed-off-by: blsaws --- "\\" | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 "\\" (limited to '\') diff --git "a/\\" "b/\\" deleted file mode 100644 index 26f792e..0000000 --- "a/\\" +++ /dev/null @@ -1,50 +0,0 @@ -Add 2nd param for user account. - -JIRA: COPPER-4 - -Signed-off-by: blsaws - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# On branch master -# Your branch is ahead of 'origin/master' by 2 commits. -# (use "git push" to publish your local commits) -# -# Changes to be committed: -# (use "git reset HEAD ..." to unstage) -# -# modified: components/congress/test-webapp/setup/install_congress_testserver_1.sh -# -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 87fc8f9..9e9001e 100644 ---- a/components/congress/test-webapp/setup/install_congress_testserver_1.sh -+++ b/components/congress/test-webapp/setup/install_congress_testserver_1.sh -@@ -22,8 +22,9 @@ - # - ~/env.sh created as part of Congress install (install_congress_3.sh) - # How to use: - # Install OPNFV per https://wiki.opnfv.org/copper/academy/joid --# $ source install_congress_testserver_1.sh --# is the name of the controller node in MAAS. -+# $ source install_congress_testserver_1.sh -+# is the name of the controller node in MAAS -+# and 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. -@@ -38,7 +39,7 @@ set -x - sudo apt-get install -y lxc - juju scp ubuntu@$1:/usr/share/lxc/templates/lxc-ubuntu ~/lxc-ubuntu - sudo cp ~/lxc-ubuntu /usr/share/lxc/templates/lxc-ubuntu --sudo lxc-create -n trusty-copper -t /usr/share/lxc/templates/lxc-ubuntu -l DEBUG -- -b opnfv ~/opnfv -+sudo lxc-create -n trusty-copper -t /usr/share/lxc/templates/lxc-ubuntu -l DEBUG -- -b $2 ~/$2 - sudo lxc-start -n trusty-copper -d - if (($? > 0)); then - echo Error starting trusty-copper lxc container -@@ -67,6 +68,6 @@ export NOVA_HOST=$(juju status --format=short | awk "/nova-cloud-controller\/0/ - EOF - - # Invoke install_congress_testserver_2.sh --ssh -t -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no opnfv@$COPPER_HOST "source ~/git/copper/components/congress/test-webapp/setup/install_congress_testserver_2.sh; exit" -+ssh -t -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $2@$COPPER_HOST "source ~/git/copper/components/congress/test-webapp/setup/install_congress_testserver_2.sh; exit" - - set +x -- cgit 1.2.3-korg