summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-10-19 07:22:26 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-10-19 07:58:51 -0500
commit9510c5939f4a30b79d6104ea5b05af42a1ea446a (patch)
treeb4625282cc988168af1eb73eaca5ab2777e5b870 /ci
parentc47f8b6275db5fe659aad4967ea024ac6e7b4146 (diff)
fixing creation of the network.
Change-Id: Id46aa07dce661dc309ccbc73d4afa62e94657b9b Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/openstack.sh23
1 files changed, 17 insertions, 6 deletions
diff --git a/ci/openstack.sh b/ci/openstack.sh
index 80b6b3da..476533fa 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -227,16 +227,27 @@ if [ "onos" == "$opnfvsdn" ]; then
#update_gw_mac
elif [ "nosdn" == "$opnfvsdn" ]; then
neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \
- --router:external=True \
- --provider:network_type flat \
- --provider:physical_network physnet1
+ --router:external=True \
+ --provider:network_type flat \
+ --provider:physical_network phynet1
neutron subnet-show ext-subnet > /dev/null 2>&1 || neutron subnet-create ext-net \
--name ext-subnet --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \
--disable-dhcp --gateway $EXTNET_GW $EXTNET_NET
-else
- neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net --router:external=True \
- --provider:physical_network physnet1
+
+elif [ "odl" == "$opnfvsdn" ]; then
+ neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \
+ --router:external=True \
+ --provider:network_type vxlan
+
+ neutron subnet-show ext-subnet > /dev/null 2>&1 || neutron subnet-create ext-net \
+ --name ext-subnet --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \
+ --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET
+ else
+ neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \
+ --router:external=True \
+ --provider:network_type flat \
+ --provider:physical_network phynet1
neutron subnet-show ext-subnet > /dev/null 2>&1 || neutron subnet-create ext-net \
--name ext-subnet --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \