X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fopenstack.sh;h=476533fa968adcef88dc64b4106dfbfce8e58bf8;hb=157b0b2fc55920773a02146660ca5b7eb78a910f;hp=80b6b3da780e31cb446fa788cfbbfcd09f8a1910;hpb=08aff60e052b5b697d8b4e53ef55c6827611999f;p=joid.git 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 \