From 98fe31feaba1db62445d8a006dd52fd5e12eba1d Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Fri, 15 Jul 2016 13:22:22 -0400 Subject: Fixes public vlan network settings JIRA: APEX-201 Change-Id: I3ba8d5e38e203bb4f23679a3b91de97c591de146 Signed-off-by: Tim Rozet --- lib/post-install-functions.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/post-install-functions.sh') diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh index 912a2a11..23c83361 100755 --- a/lib/post-install-functions.sh +++ b/lib/post-install-functions.sh @@ -76,7 +76,11 @@ EOI source overcloudrc set -o errexit echo "Configuring Neutron external network" -neutron net-create external --router:external=True --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') +if [[ -n "$public_network_vlan" && "$public_network_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 ${public_network_vlan} --provider:physical_network datacentre +else + neutron net-create external --router:external=True --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') +fi neutron subnet-create --name external-net --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') --disable-dhcp external --gateway ${public_network_gateway} --allocation-pool start=${public_network_floating_ip_range%%,*},end=${public_network_floating_ip_range##*,} ${public_network_cidr} echo "Removing sahara endpoint and service" -- cgit 1.2.3-korg