From a83e53f15e993f229c042fba3031b060a17f88cd Mon Sep 17 00:00:00 2001
From: Andrey Shestakov <ashestakov@mirantis.com>
Date: Thu, 26 Nov 2015 13:34:19 +0200
Subject: [PATCH] Fix neutron ml2 configuration for Ironic
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
---
ansible/roles/neutron/templates/ml2_conf.ini.j2 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/ansible/roles/neutron/templates/ml2_conf.ini.j2 b/ansible/roles/neutron/templates/ml2_conf.ini.j2
index 18816147f4..061d4d52c9 100644
--- a/ansible/roles/neutron/templates/ml2_conf.ini.j2
+++ b/ansible/roles/neutron/templates/ml2_conf.ini.j2
@@ -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