From f89c3659d1084b9bc118c240edfa84c521818579 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 19 Aug 2016 23:59:33 -0500 Subject: ifailed in testing moving the haproxy to openstack.sh Change-Id: I5dd5d65934e6fdf4c3935739b85399fa8610f62a Signed-off-by: Narinder Gupta --- ci/deploy.sh | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'ci/deploy.sh') 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 -- cgit 1.2.3-korg