ifailed in testing moving the haproxy to openstack.sh

[joid.git] / ci / deploy.sh

diff --git a/ci/deploy.sh b/ci/deploy.sh
index b69b5ba..1dab85d 100755 (executable)
--- 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"
-    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
-fi
-
 echo "...... deployment finished  ......."
 
-./openstack.sh "$opnfvsdn" || true
+./openstack.sh "$opnfvsdn" "$opnfvlab" || true
 sudo ../juju/get-cloud-images || true
 ../juju/joid-configure-openstack || true