From c0f6f603f07c127d5646ccdd967cfa993ef4af0b Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 17 May 2022 14:09:33 +0100 Subject: [PATCH] Support dns_domain_keywords extension Change-Id: I709abb91ac125edf2c63a85bd6af37f723e6bb6a Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/842153 Closes-Bug: 1973165 --- 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 bfff3c3b..2f76e82d 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 not in ['dns', 'dns_domain_ports', 'subnet_dns_publish_fixed_ip'] %} + {% if plugin not in ['dns', 'dns_domain_ports', 'subnet_dns_publish_fixed_ip', 'dns_domain_keywords'] %} {% 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 8495a215..dc15b64d 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 %}{% if 'dns_domain_ports' in neutron_plugin_base %},dns_domain_ports{% endif %}{% if 'subnet_dns_publish_fixed_ip' in neutron_plugin_base %},subnet_dns_publish_fixed_ip{% 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 'subnet_dns_publish_fixed_ip' in neutron_plugin_base %},subnet_dns_publish_fixed_ip{% endif %}{% if 'dns_domain_keywords' in neutron_plugin_base %},dns_domain_keywords{% 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 }}