openstack/kolla-ansible
Code Issues Proposed changes

ironic: add enable_ironic_dnsmasq parameter

Browse Source 
With the enable_ironic_dnsmasq parameter it is possible
to explicitly disable the ironic-dnsmasq service. By default,
the parameter is set to the value of enable_ironic

Change-Id: Icf94e5d6980ff238eac90e4f8cd8e530477a9c5b
This commit is contained in:
Christian Berendt 2023-03-06 23:36:57 +01:00
parent 308089bb64
commit 232aeaaa5f
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

@ -694,6 +694,7 @@ enable_horizon_watcher: "{{ enable_watcher | bool }}"
enable_horizon_zun: "{{ enable_zun | bool }}" enable_horizon_zun: "{{ enable_zun | bool }}"
enable_influxdb: "{{ enable_cloudkitty | bool and cloudkitty_storage_backend == 'influxdb' }}" enable_influxdb: "{{ enable_cloudkitty | bool and cloudkitty_storage_backend == 'influxdb' }}"
enable_ironic: "no" enable_ironic: "no"
enable_ironic_dnsmasq: "{{ enable_ironic | bool }}"
enable_ironic_neutron_agent: "{{ enable_neutron | bool and enable_ironic | bool }}" enable_ironic_neutron_agent: "{{ enable_neutron | bool and enable_ironic | bool }}"
# TODO(yoctozepto): Remove the deprecated enable_ironic_pxe_uefi in Zed. # TODO(yoctozepto): Remove the deprecated enable_ironic_pxe_uefi in Zed.
enable_ironic_pxe_uefi: "no" enable_ironic_pxe_uefi: "no"

2
ansible/roles/ironic/defaults/main.yml
View File

@ -77,7 +77,7 @@ ironic_services:
ironic-dnsmasq: ironic-dnsmasq:
container_name: ironic_dnsmasq container_name: ironic_dnsmasq
group: ironic-inspector group: ironic-inspector
enabled: true enabled: "{{ enable_ironic_dnsmasq }}"
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
image: "{{ ironic_dnsmasq_image_full }}" image: "{{ ironic_dnsmasq_image_full }}"

4
ansible/roles/ironic/tasks/precheck.yml
View File

@ -72,4 +72,6 @@
ironic_dnsmasq_dhcp_ranges must be a list ironic_dnsmasq_dhcp_ranges must be a list
connection: local connection: local
run_once: True run_once: True
when: not ironic_dnsmasq_dhcp_ranges is sequence when:
- enable_ironic_dnsmasq | bool
- not ironic_dnsmasq_dhcp_ranges is sequence

6
releasenotes/notes/enable_ironic_dnsmasq-4288e3e2b5819f2d.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
With the ``enable_ironic_dnsmasq`` parameter it is possible
to explicitly disable the ironic-dnsmasq service. By default,
the parameter is set to the value of ``enable_ironic``.