modfied to take care of labconfig.yaml file copy and change the

[joid.git] / ci / deploy.sh

diff --git a/ci/deploy.sh b/ci/deploy.sh
index b69b5ba..bb7e63b 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -167,10 +167,10 @@ echo "...... deploy public api proxy ......"
 if [ "$opnfvlab" == "orangepod1" ] && [ "$opnfvsdn" == "nosdn" ]; then # only for first test phase
     PUB_API_NET=$(grep floating-ip-range ./labconfig.yaml |cut -d/ -f2)
     PUB_API_IP=$(grep public-api-ip ./labconfig.yaml |cut -d: -f2)
-    juju run --unit nodes/0 "sudo ip a a ${PUB_API_IP}/${PUB_API_NET} dev br-ex"
-    juju run --unit nodes/0 "sudo ip l set dev br-ex up"
-    python genPublicAPIProxyBundle.py -l labconfig.yaml > haproxy.bundle.yaml
-    juju-deployer -vW -d -t 7200 -r 5 -c haproxy.bundle.yaml haproxy
+    juju run --unit nodes/0 "sudo ip a a ${PUB_API_IP}/${PUB_API_NET} dev br-ex" || true
+    juju run --unit nodes/0 "sudo ip l set dev br-ex up" || true
+    python genPublicAPIProxyBundle.py -l labconfig.yaml >> bundles.yaml
+    juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $opnfvdistro-"$openstack" || true
 fi
 
 echo "...... deployment finished  ......."