openstack/kolla-ansible
Code Issues Proposed changes

Fix neutron ml2 configuration for Ironic

Browse Source 
vxlan should be allowed in tenant_network_types because it used in
tunnel_types.
Allow all flat networks when ironic enabled.

TrivialFix
Change-Id: I39b2fbf26bb4c9047e7c3ea5ca7749ae113e4ed8
This commit is contained in:
Andrey Shestakov 2015-11-26 13:34:19 +02:00
parent 632eb2030f
commit a83e53f15e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ansible/roles/neutron/templates/ml2_conf.ini.j2
View File

@ -1,8 +1,7 @@
# ml2_conf.ini
[ml2]
{% if enable_ironic | bool %}
type_drivers = flat
tenant_network_types = flat
tenant_network_types = vxlan, flat
mechanism_drivers = openvswitch
{% else %}
# Changing type_drivers after bootstrap can lead to database inconsistencies
@ -24,7 +23,11 @@ network_vlan_ranges =
{% endif %}
[ml2_type_flat]
{% if enable_ironic | bool %}
flat_networks = *
{% else %}
flat_networks = physnet1
{% endif %}
[ml2_type_vxlan]
vni_ranges = 1:1000