openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Allow to set dnsmasq configuration options

Browse Source 
This is useful to work around
https://bugs.launchpad.net/ubuntu/+source/dnsmasq/+bug/1974230 by setting
"no-negcache" into neutron_dhcp_config_list.

Change-Id: I1a0c1b5a125c72635efc89c9763aa41bfb503a3f
This commit is contained in:
Marcus Klein 2022-11-17 12:11:48 +01:00
parent 9bbb133267
commit 2d53620286
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
defaults/main.yml
View File

@ -121,6 +121,11 @@ neutron_dns_domain: "{{ dhcp_domain | default('openstacklocal.') }}"
# dhcp-option-force: "26,1500" # dhcp-option-force: "26,1500"
neutron_dhcp_config: {} neutron_dhcp_config: {}
# Dnsmasq has furthermore some options in its configuration that are not
# key/value pairs but just options. A deployer can configure those with this
# list:
neutron_dhcp_config_list: []
# Disable dnsmasq to resolve DNS via local resolv.conf. # Disable dnsmasq to resolve DNS via local resolv.conf.
# When dnsmasq_dns_servers are not set, # When dnsmasq_dns_servers are not set,
# and neutron_dnsmasq_noresolv is set to True, dnsmasq will reply with # and neutron_dnsmasq_noresolv is set to True, dnsmasq will reply with

7
releasenotes/notes/neutron-dhcp-config-list-3e9354e5da138b53.yaml Normal file
View File

@ -0,0 +1,7 @@
---
features:
- |
You can configure options for dnsmasq by adding those to the newly
introduced ``neutron_dhcp_config_list`` list. This helps to configure e.g.
``no-negcache`` to get around
https://bugs.launchpad.net/ubuntu/+source/dnsmasq/+bug/1974230.

3
templates/dnsmasq-neutron.conf.j2
View File

@ -3,6 +3,9 @@
{% for key, value in neutron_dhcp_config.items() %} {% for key, value in neutron_dhcp_config.items() %}
{{ key }}={{ value }} {{ key }}={{ value }}
{% endfor %} {% endfor %}
{% for option in neutron_dhcp_config_list %}
{{ option }}
{% endfor %}
user={{ neutron_system_user_name }} user={{ neutron_system_user_name }}
{% if neutron_dnsmasq_noresolv %} {% if neutron_dnsmasq_noresolv %}
no-resolv no-resolv