openstack/openstack-ansible
Code Issues Proposed changes

Neutron ML2 template fix

Browse Source 
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
This commit is contained in:
Logan V 2016-01-18 20:14:02 -06:00 committed by Jesse Pretorius (odyssey4me)
parent 2b6c9c39fa
commit fea841c449
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/roles/os_neutron/templates/plugins/ml2/ml2_conf.ini.j2
View File

@ -9,7 +9,7 @@ extension_drivers = port_security
path_mtu = 0 path_mtu = 0
segment_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 flat networks
[ml2_type_flat] [ml2_type_flat]
@ -17,7 +17,7 @@ flat_networks = {{ neutron_provider_networks.network_flat_networks }}
{% endif %} {% endif %}
{% if neutron_provider_networks.network_vlan_ranges %} {% if neutron_provider_networks.network_vlan_ranges is defined %}
# ML2 VLAN networks # ML2 VLAN networks
[ml2_type_vlan] [ml2_type_vlan]