diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-26 14:36:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-26 14:36:57 +0000 |
| commit | 6fb514e06b402873a07fe1e1f2546521ead6f39b (patch) | |
| tree | 03c7c50fecfa5e7ce8cb7a38f475801e1c5742ba /ansible | |
| parent | 3888c21a312502e6d34264e8aba8899eb6a5f3b8 (diff) | |
| parent | a83e53f15e993f229c042fba3031b060a17f88cd (diff) | |
| download | kolla-6fb514e06b402873a07fe1e1f2546521ead6f39b.tar.gz kolla-6fb514e06b402873a07fe1e1f2546521ead6f39b.zip | |
Merge "Fix neutron ml2 configuration for Ironic"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/neutron/templates/ml2_conf.ini.j2 | 7 |
1 files 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 18816147f..061d4d52c 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 |