From: Stuart Mackie <wsmackie@juniper.net>
Date: Tue, 28 Nov 2017 19:03:40 +0000 (-0800)
Subject: Use juju run --application for patching OpenContrail containers
X-Git-Tag: opnfv-5.1.RC1~7
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b96be4610f787bf487b3e64061000249208bde7f;p=joid.git

Use juju run --application for patching OpenContrail containers

Change-Id: Id0a2f5597a4f916d8a92ac9c01bb94c511a95045
Signed-off-by: Stuart Mackie <wsmackie@juniper.net>
(cherry picked from commit 27597328935fff61ec826b698cca2c03c05a014c)
---

diff --git a/ci/deploy.sh b/ci/deploy.sh
index d79cabc4..2022b87b 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -324,13 +324,15 @@ jujuver=`juju --version`
 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"