modified to include MAAS 2.0 on remote host.

[joid.git] / ci / openstack.sh

diff --git a/ci/openstack.sh b/ci/openstack.sh
index 80b6b3d..513bf99 100755 (executable)
--- 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 physnet1
 
     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 physnet1
 
     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 \