From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Sat, 9 Sep 2017 14:11:34 +0000 (+0000)
Subject: Revert "External network for ocl"
X-Git-Tag: opnfv-5.0.RC1~13^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6a7cd39b6fd468fde67fa8a95f31cf7c06cbbadb;p=joid.git

Revert "External network for ocl"

This reverts commit b71fa1a1b388d3db115677541afac6042fa9b07e.

Change-Id: Ic54ed7ad43b61785038c7597bba3d7fafcc13fb6
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/openstack.sh b/ci/openstack.sh
index b9504d2a..d449fb1b 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -169,18 +169,6 @@ if [ "onos" == "$opnfvsdn" ]; then
     launch_eth
     neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \
                                                    --router:external=True
-if [ "ocl" == "$opnfvsdn" ]; then
-    if [ ! neutron net-show ext-net > /dev/null 2>&1 ]
-    then 
-      neutron net-create ext-net 
-      LAST_UNIT=`juju status | grep nova-compute/ | tail -1 | cut -c14`
-      for ii in {0..$LAST_UNIT}
-      do
-        ssh $II sudo docker exec contrail-controller \
-          python /opt/contrail/utils/provision_vgw_interface.py\
-           --oper create --interface vgw1 --subnets $SUBNET --routes 0.0.0.0/24 --vrf default-domain:admin:$FIP-VN:$FIP-VN  
-      done
-    fi
 else
     neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \
                                                    --router:external=True \