Merge "Fix neutron ml2 configuration for Ironic"

ansible/roles/neutron/templates/ml2_conf.ini.j2

 # 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