summaryrefslogtreecommitdiffstats
path: root/lib/post-install-functions.sh
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-07-18 12:11:15 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-18 12:11:15 +0000
commit73e52458f6f22ec453ec08cc0960d8b8e0ce45fe (patch)
treeebb5efde5b0af111c1c2de0b8416cdade7f73266 /lib/post-install-functions.sh
parentddecb36accd3f229ccee6113ee04b9e623885203 (diff)
parent98fe31feaba1db62445d8a006dd52fd5e12eba1d (diff)
Merge "Fixes public vlan network settings"
Diffstat (limited to 'lib/post-install-functions.sh')
-rwxr-xr-xlib/post-install-functions.sh6
1 files changed, 5 insertions, 1 deletions
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"