From: Stuart Mackie <wsmackie@juniper.net>
Date: Tue, 12 Sep 2017 16:52:42 +0000 (-0700)
Subject: Add --router
X-Git-Tag: opnfv-5.0.RC1~9
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b633be500f32bb803ed6c89744f2c1bc512bc466;p=joid.git

Add --router

Change-Id: Iaa5ac00b3a8cbc239f178cbfca2268fea7def235
Signed-off-by: Stuart Mackie <wsmackie@juniper.net>
---

diff --git a/ci/openstack.sh b/ci/openstack.sh
index a3287ca3..8d25a4e7 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -170,7 +170,8 @@ if [ "onos" == "$opnfvsdn" ]; then
     neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \
                                                    --router:external=True
 elif [ "ocl" == "$opnfvsdn" ]; then
-    neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net
+    neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \
+                                                   --router:external=True
 
 else
     neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \
@@ -186,9 +187,9 @@ neutron subnet-show ext-subnet > /dev/null 2>&1 || neutron subnet-create ext-net
 # Ocl can push packets to the fabric network in order to reach a gateway if BGP/L3VPN hasn't been configured.
 if [ "ocl" == "$opnfvsdn" ]; then
     echo "Creating simple gateway functions on ocl vRouters"
-      juju run --application nova-compute " sudo docker exec contrail-controller \
-        python /opt/contrail/utils/provision_vgw_interface.py \
-         --oper create --interface vgw1 --subnets $EXTNET_NET --routes 0.0.0.0/24 --vrf default-domain:admin:ext-net:ext-net "
+      juju run --application nova-compute "sudo docker exec contrail-controller \
+        python /opt/contrail/utils/provision_vgw_interface.py\
+         --oper create --interface vgw1 --subnets $EXTNET_NET --routes 0.0.0.0/24 --vrf default-domain:admin:ext-net:ext-net" 
 fi
 
 #congress team is not updating and supporting charm anymore so defer it.