Allow extra free-form configuration of ironic inspector's dnsmasq service

Place in ${KAYOBE_CONFIG_PATH}/kolla/config/ironic/ironic-dnsmasq.conf.
This commit is contained in:
Mark Goddard 2017-06-14 16:38:43 +01:00
parent 53ac42c419
commit c0cf1c9b74
3 changed files with 9 additions and 0 deletions

View File

@ -17,6 +17,7 @@
- { name: glance, file: glance.conf }
- { name: inspector, file: ironic-inspector.conf }
- { name: ironic, file: ironic.conf }
- { name: ironic_dnsmasq, file: ironic/ironic-dnsmasq.conf }
- { name: magnum, file: magnum.conf }
- { name: neutron, file: neutron.conf }
- { name: neutron_ml2, file: neutron/ml2_conf.ini }
@ -91,6 +92,7 @@
kolla_extra_glance: "{{ kolla_extra_config.glance | default }}"
kolla_extra_inspector: "{{ kolla_extra_config.inspector | default }}"
kolla_extra_ironic: "{{ kolla_extra_config.ironic | default }}"
kolla_extra_ironic_dnsmasq: "{{ kolla_extra_config.ironic_dnsmasq | default }}"
kolla_extra_magnum: "{{ kolla_extra_config.magnum | default }}"
kolla_extra_neutron: "{{ kolla_extra_config.neutron | default }}"
kolla_extra_neutron_ml2: "{{ kolla_extra_config.neutron_ml2 | default }}"

View File

@ -159,6 +159,9 @@ kolla_inspector_dhcp_pool_start:
# End of range of IP addresses for dnsmasq to allocate from.
kolla_inspector_dhcp_pool_end:
# Free form extra configuration to append to dnsmasq.conf.
kolla_extra_ironic_dnsmasq:
###############################################################################
# Magnum configuration.

View File

@ -10,3 +10,7 @@ dhcp-option=option:server-ip-address,{% raw %}{{ kolla_internal_vip_address }}{%
dhcp-option=option:bootfile-name,pxelinux.0
dhcp-option=210,/tftpboot/
{% if kolla_extra_ironic_dnsmasq %}
{{ kolla_extra_ironic_dnsmasq }}
{% endif %}