diff options
Diffstat (limited to 'ci/openstack.sh')
| -rwxr-xr-x | ci/openstack.sh | 23 |
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 \ |