From 345b49b9b7c374c81296f5f371d2d360db337fb9 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Fri, 18 Nov 2016 12:46:11 -0500 Subject: Fixes external network creation Without specifying the provider network type or physical network results in the default tenant network type being used upon external network creation (for us this means vxlan). Previously this worked fine because Neutron L3 agent and ODL L3 would assume to use br-ex. This is no longer true in ODL new nettvirt, and needs to be explicitly flat along with the correct physical network. Also includes minor fix for Manila service naming that was fixed upstream. JIRA: APEX-300 Change-Id: If5d467a811baafe01b725dd530938482fdd3fd03 Signed-off-by: Tim Rozet --- lib/post-install-functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh index 604eb70d..d396f8bf 100755 --- a/lib/post-install-functions.sh +++ b/lib/post-install-functions.sh @@ -90,7 +90,7 @@ echo "Configuring Neutron external network" if [[ -n "$external_nic_mapping_compute_vlan" && "$external_nic_mapping_compute_vlan" != 'native' ]]; then neutron net-create external --router:external=True --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') --provider:network_type vlan --provider:segmentation_id ${external_nic_mapping_compute_vlan} --provider:physical_network datacentre else - neutron net-create external --router:external=True --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') + neutron net-create external --router:external=True --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') --provider:network_type flat --provider:physical_network datacentre fi if [ "$external_network_ipv6" == "True" ]; then neutron subnet-create --name external-net --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') external --ip_version 6 --ipv6_ra_mode slaac --ipv6_address_mode slaac --gateway ${external_gateway} --allocation-pool start=${external_floating_ip_range%%,*},end=${external_floating_ip_range##*,} ${external_cidr} -- cgit 1.2.3-korg