From c0cf1c9b74e261a4fa5a12d6a043c4a102fe4c56 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 14 Jun 2017 16:38:43 +0100
Subject: [PATCH] Allow extra free-form configuration of ironic inspector's
dnsmasq service
Place in ${KAYOBE_CONFIG_PATH}/kolla/config/ironic/ironic-dnsmasq.conf.
---
ansible/kolla-openstack.yml | 2 ++
ansible/roles/kolla-openstack/defaults/main.yml | 3 +++
.../roles/kolla-openstack/templates/ironic-dnsmasq.conf.j2 | 4 ++++
3 files changed, 9 insertions(+)
diff --git a/ansible/kolla-openstack.yml b/ansible/kolla-openstack.yml
index 81fb2cb0..0ba13f00 100644
--- a/ansible/kolla-openstack.yml
+++ b/ansible/kolla-openstack.yml
@@ -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 }}"
diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml
index b2f783a4..2f95d2cb 100644
--- a/ansible/roles/kolla-openstack/defaults/main.yml
+++ b/ansible/roles/kolla-openstack/defaults/main.yml
@@ -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.
diff --git a/ansible/roles/kolla-openstack/templates/ironic-dnsmasq.conf.j2 b/ansible/roles/kolla-openstack/templates/ironic-dnsmasq.conf.j2
index a463e426..cc64cae0 100644
--- a/ansible/roles/kolla-openstack/templates/ironic-dnsmasq.conf.j2
+++ b/ansible/roles/kolla-openstack/templates/ironic-dnsmasq.conf.j2
@@ -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 %}
--
GitLab