From fea841c4496b8551bf683f4ea5d2a56d8e0bed9d Mon Sep 17 00:00:00 2001 From: Logan V Date: Mon, 18 Jan 2016 20:14:02 -0600 Subject: [PATCH] Neutron ML2 template fix Neutron fails to deploy if neutron_provider_networks.network_flat_networks or neutron_provider_networks.network_vlan_ranges are not set. This will fix that by making these template sections 'if defined' Change-Id: I4fcc542a7177e9a84302fae03731dad044bf947c Closes-Bug: #1535498 --- .../roles/os_neutron/templates/plugins/ml2/ml2_conf.ini.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/os_neutron/templates/plugins/ml2/ml2_conf.ini.j2 b/playbooks/roles/os_neutron/templates/plugins/ml2/ml2_conf.ini.j2 index 5aae8132e4..3686ae2bc6 100644 --- a/playbooks/roles/os_neutron/templates/plugins/ml2/ml2_conf.ini.j2 +++ b/playbooks/roles/os_neutron/templates/plugins/ml2/ml2_conf.ini.j2 @@ -9,7 +9,7 @@ extension_drivers = port_security path_mtu = 0 segment_mtu = 0 -{% if neutron_provider_networks.network_flat_networks %} +{% if neutron_provider_networks.network_flat_networks is defined %} # ML2 flat networks [ml2_type_flat] @@ -17,7 +17,7 @@ flat_networks = {{ neutron_provider_networks.network_flat_networks }} {% endif %} -{% if neutron_provider_networks.network_vlan_ranges %} +{% if neutron_provider_networks.network_vlan_ranges is defined %} # ML2 VLAN networks [ml2_type_vlan]