Fixing default l2population mechanism handler for vxlan nets.
DVR nets could be built upon vlans.
Fixes: PROD-15463
Change-Id: Ia7f74e4e3671a1975732eea8b991e6cc39b19ac5
diff --git a/neutron/files/mitaka/ml2_conf.ini b/neutron/files/mitaka/ml2_conf.ini
index 19ce326..3b0abcb 100644
--- a/neutron/files/mitaka/ml2_conf.ini
+++ b/neutron/files/mitaka/ml2_conf.ini
@@ -100,7 +100,7 @@
{%- for mechanism_name, mechanism in server.get('backend', {}).get('mechanism', []).items() %}
{%- do mechanism_drivers.append(mechanism.get('driver')) if 'driver' in mechanism %}
{%- endfor %}
-{%- if server.get('dvr', False) %}
+{%- if "vxlan" in server.backend.tenant_network_types %}
{%- do mechanism_drivers.append('l2population') %}
{%- endif %}
mechanism_drivers = {{ ','.join(mechanism_drivers) }}
diff --git a/neutron/files/newton/ml2_conf.ini b/neutron/files/newton/ml2_conf.ini
index 19ce326..3b0abcb 100644
--- a/neutron/files/newton/ml2_conf.ini
+++ b/neutron/files/newton/ml2_conf.ini
@@ -100,7 +100,7 @@
{%- for mechanism_name, mechanism in server.get('backend', {}).get('mechanism', []).items() %}
{%- do mechanism_drivers.append(mechanism.get('driver')) if 'driver' in mechanism %}
{%- endfor %}
-{%- if server.get('dvr', False) %}
+{%- if "vxlan" in server.backend.tenant_network_types %}
{%- do mechanism_drivers.append('l2population') %}
{%- endif %}
mechanism_drivers = {{ ','.join(mechanism_drivers) }}
diff --git a/neutron/files/ocata/ml2_conf.ini b/neutron/files/ocata/ml2_conf.ini
index 3056ae5..f7afe92 100644
--- a/neutron/files/ocata/ml2_conf.ini
+++ b/neutron/files/ocata/ml2_conf.ini
@@ -134,7 +134,7 @@
{%- for mechanism_name, mechanism in server.get('backend', {}).get('mechanism', []).items() %}
{%- do mechanism_drivers.append(mechanism.get('driver')) if 'driver' in mechanism %}
{%- endfor %}
-{%- if server.get('dvr', False) %}
+{%- if "vxlan" in server.backend.tenant_network_types %}
{%- do mechanism_drivers.append('l2population') %}
{%- endif %}
mechanism_drivers = {{ ','.join(mechanism_drivers) }}