From 9af5fe6aa6b58e62ed4377deb52848e5bced50b6 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Mon, 10 Dec 2018 14:31:47 +0000 Subject: [PATCH] Add support for dns_domain_ports api extension See https://docs.openstack.org/neutron/rocky/admin/config-dns-int.html Change-Id: Ie4e97730304fb8a52e3ab933a202d79ec6e71585 --- templates/neutron.conf.j2 | 2 +- templates/plugins/ml2/ml2_conf.ini.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2 index 5ec92163..96706b4d 100644 --- a/templates/neutron.conf.j2 +++ b/templates/neutron.conf.j2 @@ -2,7 +2,7 @@ {% set neutron_plugin_loaded_base = [] %} {% for plugin in neutron_plugin_base %} - {% if plugin != 'dns' %} + {% if plugin not in ['dns', 'dns_domain_ports'] %} {% set _ = neutron_plugin_loaded_base.append(plugin) %} {% endif %} {% endfor %} diff --git a/templates/plugins/ml2/ml2_conf.ini.j2 b/templates/plugins/ml2/ml2_conf.ini.j2 index 2b901aad..1737b285 100644 --- a/templates/plugins/ml2/ml2_conf.ini.j2 +++ b/templates/plugins/ml2/ml2_conf.ini.j2 @@ -5,7 +5,7 @@ type_drivers = {{ neutron_plugins[neutron_plugin_type].drivers_type }} tenant_network_types = {{ neutron_provider_networks.network_types if neutron_provider_networks.network_types != '' else 'local' }} mechanism_drivers = {{ neutron_ml2_mechanism_drivers }} -extension_drivers = port_security{% if 'qos' in neutron_plugin_base %},qos{% endif %}{% if 'dns' in neutron_plugin_base %},dns{% endif %} +extension_drivers = port_security{% if 'qos' in neutron_plugin_base %},qos{% endif %}{% if 'dns' in neutron_plugin_base %},dns{% endif %}{% if 'dns_domain_ports' in neutron_plugin_base %},dns_domain_ports{% endif %} {% if neutron_provider_networks.network_mappings is defined and (neutron_plugin_type == 'ml2.opendaylight' and ('odl-router_v2' in neutron_plugin_base or 'odl-router' in neutron_plugin_base)) %} bridge_mappings = {{ neutron_provider_networks.network_mappings }}