openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add support for neutron custom dnsmasq.conf"

Browse Source
This commit is contained in:
Zuul 2019-06-27 13:59:42 +00:00 committed by Gerrit Code Review
commit 85b9dabcd4
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/neutron/tasks/config.yml
View File

@ -196,10 +196,14 @@
service_name: "neutron-dhcp-agent" service_name: "neutron-dhcp-agent"
neutron_dhcp_agent: "{{ neutron_services[service_name] }}" neutron_dhcp_agent: "{{ neutron_services[service_name] }}"
template: template:
src: "dnsmasq.conf.j2" src: "{{ item }}"
dest: "{{ node_config_directory }}/{{ service_name }}/dnsmasq.conf" dest: "{{ node_config_directory }}/{{ service_name }}/dnsmasq.conf"
mode: "0660" mode: "0660"
register: dnsmasq_conf register: dnsmasq_conf
with_first_found:
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/dnsmasq.conf"
- "{{ node_custom_config }}/neutron/dnsmasq.conf"
- "dnsmasq.conf.j2"
when: when:
- neutron_dhcp_agent.enabled | bool - neutron_dhcp_agent.enabled | bool
- neutron_dhcp_agent.host_in_groups | bool - neutron_dhcp_agent.host_in_groups | bool

6
releasenotes/notes/add-neutron-custom-dnsmasq-conf-bba1ac18df0dccd4.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
The ``dnsmasq.conf`` configuration file used by the Neutron DHCP agent can be
overwritten by ``{{ node_custom_config}}/neutron/dnsmasq.conf`` or
``{{ node_custom_config }}/neutron/{{ inventory_hostname }}/dnsmasq.conf``.