summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorStuart Mackie <wsmackie@juniper.net>2017-11-28 11:03:40 -0800
committerStuart Mackie <wsmackie@juniper.net>2017-11-28 11:03:40 -0800
commit27597328935fff61ec826b698cca2c03c05a014c (patch)
tree57cf145469d547224b1aad8487d31c07ff8425aa /ci
parent01e331239780afb41557f5436238b438865bcafb (diff)
Use juju run --application for patching OpenContrail containers
Change-Id: Id0a2f5597a4f916d8a92ac9c01bb94c511a95045 Signed-off-by: Stuart Mackie <wsmackie@juniper.net>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh16
1 files changed, 9 insertions, 7 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 00e8aef0..ab3e5e34 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -322,13 +322,15 @@ python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, i
if ([ $opnfvmodel == "openstack" ]); then
if ([ $opnfvsdn == "ocl" ]); then
echo_info "Patching OpenContrail controller container"
- juju ssh contrail-controller/0 sudo docker cp contrail-controller:/etc/contrail/vnc_api_lib.ini /tmp
- juju ssh contrail-controller/0 cp /tmp/vnc_api_lib.ini /tmp/vnc_api_lib.ini2
- juju ssh contrail-controller/0 'echo "AUTHN_DOMAIN = admin_domain" >> /tmp/vnc_api_lib.ini2'
- juju ssh contrail-controller/0 sudo docker cp /tmp/vnc_api_lib.ini2 contrail-controller:/etc/contrail/vnc_api_lib.ini
- juju ssh contrail-controller/0 sudo docker exec -it contrail-controller service contrail-api restart
-
- juju ssh contrail-controller/0 sudo docker cp /tmp/vnc_api_lib.ini2 contrail-analytics:/etc/contrail/vnc_api_lib.ini
+ juju run --application contrail-controller sudo docker cp contrail-controller:/etc/contrail/vnc_api_lib.ini /tmp
+ juju run --application contrail-controller cp /tmp/vnc_api_lib.ini /tmp/vnc_api_lib.ini2
+ juju run --application contrail-controller 'echo "AUTHN_DOMAIN = admin_domain" >> /tmp/vnc_api_lib.ini2'
+ juju run --application contrail-controller sudo docker cp /tmp/vnc_api_lib.ini2 contrail-controller:/etc/contrail/vnc_api_lib.ini
+ juju run --application contrail-controller sudo docker exec contrail-controller service contrail-api restart
+
+ juju run --application contrail-controller sudo docker cp /tmp/vnc_api_lib.ini2 contrail-analytics:/etc/contrail/vnc_api_lib.ini
+ echo_info "Wait for OpenContrail components to stabilize"
+ sleep 600
fi
echo_info "Configuring OpenStack deployment"