X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fdeploy.sh;h=1dab85d84231fd10e674a78090331619141dd03a;hb=f89c3659d1084b9bc118c240edfa84c521818579;hp=bb7e63bcb272370fba9892ec1b59f3024f9f31f7;hpb=70a1875624b0c25b1a8833fb4094ef98c75631f3;p=joid.git

diff --git a/ci/deploy.sh b/ci/deploy.sh
index bb7e63bc..1dab85d8 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -162,20 +162,9 @@ deploy
 
 check_status
 
-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" || 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  ......."
 
-./openstack.sh "$opnfvsdn" || true
+./openstack.sh "$opnfvsdn" "$opnfvlab" || true
 sudo ../juju/get-cloud-images || true
 ../juju/joid-configure-openstack || true