openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Simplify condition on ovn_ssl configuration in ml2"

Browse Source
This commit is contained in:
Zuul 2025-02-15 12:18:32 +00:00 committed by Gerrit Code Review
commit 0686e096b5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,14 +51,14 @@ enable_distributed_floating_ip = {{ neutron_ovn_distributed_fip }}
ovn_metadata_enabled = True
dns_servers = {{ neutron_dnsmasq_dns_servers }}
dhcp_default_lease_time = {{ neutron_dnsmasq_lease_max }}
{% endif %}
{% if neutron_ovn_ssl and (neutron_services['neutron-server']['group'] in group_names or neutron_services['neutron-ovn-controller']['group'] in group_names) %}
{% if neutron_ovn_ssl %}
ovn_sb_ca_cert={{ [neutron_conf_version_dir, neutron_ovn_ssl_ca_cert] | join('/') }}
ovn_sb_certificate={{ [neutron_conf_version_dir, neutron_ovn_ssl_cert] | join('/') }}
ovn_sb_private_key={{ [neutron_conf_version_dir, neutron_ovn_ssl_key] | join('/') }}
ovn_nb_ca_cert={{ [neutron_conf_version_dir, neutron_ovn_ssl_ca_cert] | join('/') }}
ovn_nb_certificate={{ [neutron_conf_version_dir, neutron_ovn_ssl_cert] | join('/') }}
ovn_nb_private_key={{ [neutron_conf_version_dir, neutron_ovn_ssl_key] | join('/') }}
{% endif %}
{% endif %}
{% endif %}
# Security groups