summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-02-09 10:39:20 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2017-02-09 10:40:04 -0600
commit476fe87ba24fa6c35d8a62e1053875eba8f724a3 (patch)
treebc3fbf0d6d8556db51392e9af2677d94a15929f4 /ci
parenta49eb95b10d50cb1eb428ba4a5ce2cd90e17f6d6 (diff)
morecleanup and fix odl with ext-net as flat.
Change-Id: I7dbd300534be3f87a805d62a107c64b6d8962557 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/openstack.sh34
1 files changed, 5 insertions, 29 deletions
diff --git a/ci/openstack.sh b/ci/openstack.sh
index 71f005e2..fb412756 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -219,42 +219,18 @@ echo "...... deploy end public api proxy ......"
if [ "onos" == "$opnfvsdn" ]; then
launch_eth
- neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net --router:external=True
- 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
- #neutron subnet-create ext-net --name ext-subnet $EXTNET_NET
- #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
-
- 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
-
-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 \
- --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
+ --router:external=True
+else ([ "nosdn" == "$opnfvsdn" ] || [ "odl" == "$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
-
- 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
fi
+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
# Create Congress datasources
sudo apt-get install -y python-congressclient