openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Support dns_domain_keywords extension"

Browse Source
This commit is contained in:
Zuul 2022-05-24 20:44:26 +00:00 committed by Gerrit Code Review
commit c5ee345054
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/neutron.conf.j2
View File

@ -2,7 +2,7 @@
{% set neutron_plugin_loaded_base = [] %} {% set neutron_plugin_loaded_base = [] %}
{% for plugin in neutron_plugin_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) %} {% set _ = neutron_plugin_loaded_base.append(plugin) %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}

2
templates/plugins/ml2/ml2_conf.ini.j2
View File

@ -5,7 +5,7 @@
type_drivers = {{ neutron_plugins[neutron_plugin_type].drivers_type }} 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' }} tenant_network_types = {{ neutron_provider_networks.network_types if neutron_provider_networks.network_types != '' else 'local' }}
mechanism_drivers = {{ neutron_ml2_mechanism_drivers }} 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)) %} {% 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 }} bridge_mappings = {{ neutron_provider_networks.network_mappings }}