diff options
| author |   Bryan Sullivan <bs3131@att.com> | 2016-02-10 13:17:37 -0800 |
|---|---|---|
| committer | blsaws <bs3131@att.com> | 2016-04-01 08:30:07 -0700 |
| commit | 64e4823ae0eb90010f19a4648dc1814883a002d6 (patch) | |
| tree | 9c139ae1b778ff266061b5fc25db6c5f13fd463b | |
| parent | ddd30aace0b76befa6e7938237f9451d1a6a8c7d (diff) | |
Add "source" to remote commands executed via juju ssh.
JIRA: COPPER-2
Change-Id: I49821d730a6a2840b5bdeadba8856218bcbe521b
Signed-off-by: Bryan Sullivan <bs3131@att.com>
| -rw-r--r-- | components/congress/joid/install_congress_1.sh | 2 | ||||
| -rw-r--r-- | components/congress/joid/install_congress_3.sh | 4 | ||||
| -rw-r--r-- | components/congress/joid/install_congress_4.sh | 11 |
3 files changed, 11 insertions, 6 deletions
diff --git a/components/congress/joid/install_congress_1.sh b/components/congress/joid/install_congress_1.sh index 244b8d6..ec0cd83 100644 --- a/components/congress/joid/install_congress_1.sh +++ b/components/congress/joid/install_congress_1.sh @@ -24,4 +24,4 @@ # next: see install_congress_3.sh juju scp ~/git/copper/components/congress/joid/install_congress_2.sh ubuntu@node1-control:/home/ubuntu -juju ssh ubuntu@node1-control "~/install_congress_2.sh; exit" +juju ssh ubuntu@node1-control "source ~/install_congress_2.sh; exit" diff --git a/components/congress/joid/install_congress_3.sh b/components/congress/joid/install_congress_3.sh index 980debb..4507fed 100644 --- a/components/congress/joid/install_congress_3.sh +++ b/components/congress/joid/install_congress_3.sh @@ -26,7 +26,7 @@ # source ~/git/copper/components/congress/joid/install_congress_3.sh cat <<EOF >~/env.sh -export CONGRESS_HOST=192.168.10.125 +export CONGRESS_HOST=192.168.10.118 export KEYSTONE_HOST=$(juju status --format=short | awk "/keystone\/0/ { print \$3 }") export CEILOMETER_HOST=$(juju status --format=short | awk "/ceilometer\/0/ { print \$3 }") export CINDER_HOST=$(juju status --format=short | awk "/cinder\/0/ { print \$3 }") @@ -38,4 +38,4 @@ source ~/env.sh juju scp ~/admin-openrc.sh ubuntu@$CONGRESS_HOST:/home/ubuntu juju scp ~/env.sh ubuntu@$CONGRESS_HOST:/home/ubuntu juju scp ~/git/copper/components/congress/joid/install_congress_4.sh ubuntu@$CONGRESS_HOST:/home/ubuntu -juju ssh ubuntu@$CONGRESS_HOST "~/install_congress_4.sh; exit" +juju ssh ubuntu@$CONGRESS_HOST "source ~/install_congress_4.sh; exit" diff --git a/components/congress/joid/install_congress_4.sh b/components/congress/joid/install_congress_4.sh index bf40685..c5a2714 100644 --- a/components/congress/joid/install_congress_4.sh +++ b/components/congress/joid/install_congress_4.sh @@ -42,7 +42,11 @@ sudo apt-get install git gcc python-dev libxml2 libxslt1-dev libzip-dev -y sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password password opnfvmysql' sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password opnfvmysql' sudo -E apt-get -q -y install mysql-server python-mysqldb -sudo pip install virtualenv +sudo pip install virtualenvsource ~/admin-openrc.sh <<EOF +openstack +EOF +source ~/env.sh + # clone congressedit congress.conf.sample as needed mkdir ~/git cd ~/git @@ -146,7 +150,8 @@ sudo bin/congress-server & # disown the process (so it keeps running if you get disconnected) disown -h %1 # Create data sources -# To remove datasources: openstack congress datasource delete <name> Probably good to do these commands in a new terminal tab, as the congress server log from the last command will be flooding your original terminal screen… +# To remove datasources: openstack congress datasource delete <name> +# May need to insert a delay here, as nova datasource seems to fail to get setup (server not ready?) openstack congress datasource create nova "nova" \ --config username=$OS_USERNAME \ --config tenant_name=$OS_TENANT_NAME \ @@ -179,4 +184,4 @@ openstack congress datasource create keystone "keystone" \ --config auth_url=http://$KEYSTONE_HOST:5000/v2.0 # Run Congress Tempest Tests cd ~/git/congress -tox -epy27 +# tox -epy27 |