From 7bcdb7f7deaf8446927c481e007a79b12d8201be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harald=20Jens=C3=A5s?= <hjensas@redhat.com>
Date: Thu, 16 Aug 2018 16:27:42 +0200
Subject: [PATCH] Add start/stop command for ironic-inspector-dnsmasq

When the PXE filter's dhcp-hostsdir is purged on start/stop
of the ironic-inspector service inspectors dnsmasq service
must also be restarted to ensure that the dhcp server config
is updated as well.

Partial-bug: #1780421
Depends-On: Ie961ec4d3b6b65a462e2d2493f5b9240c2bfa7a6
Change-Id: I22c7be368b62ef93efabcbd2c13599625ea45548
---
 .../puppet-stack-config/puppet-stack-config.yaml.template   | 2 ++
 ...ask-pxe-filter-start-stop-commands-c1f71c6f38f27c78.yaml | 6 ++++++
 2 files changed, 8 insertions(+)
 create mode 100644 releasenotes/notes/dnsmask-pxe-filter-start-stop-commands-c1f71c6f38f27c78.yaml

diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index 5e627d215..4dbc11c35 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -584,6 +584,8 @@ ironic::inspector::dnsmasq_local_ip: {{LOCAL_IP}}
 ironic::inspector::dnsmasq_interface: {{INSPECTION_INTERFACE}}
 ironic::inspector::dnsmasq_ip_subnets: {{{INSPECTION_SUBNETS}}}
 ironic::inspector::pxe_filter::driver: dnsmasq
+ironic::inspector::pxe_filter::dnsmasq::dnsmasq_start_command: 'systemctl start openstack-ironic-inspector-dnsmasq.service'
+ironic::inspector::pxe_filter::dnsmasq::dnsmasq_stop_command: 'systemctl stop openstack-ironic-inspector-dnsmasq.service'
 ironic::inspector::dnsmasq_dhcp_hostsdir: '/var/lib/ironic-inspector/dhcp-hostsdir'
 ironic::inspector::ramdisk_collectors: {{INSPECTION_COLLECTORS}}
 ironic::inspector::additional_processing_hooks: 'extra_hardware,lldp_basic,local_link_connection'
diff --git a/releasenotes/notes/dnsmask-pxe-filter-start-stop-commands-c1f71c6f38f27c78.yaml b/releasenotes/notes/dnsmask-pxe-filter-start-stop-commands-c1f71c6f38f27c78.yaml
new file mode 100644
index 000000000..70d27a7d0
--- /dev/null
+++ b/releasenotes/notes/dnsmask-pxe-filter-start-stop-commands-c1f71c6f38f27c78.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes and issue where the PXE filter in ironic-inspectors DHCP server may
+    become out of sync with the ironic-inspector service. `Bug 1780421
+    <https://bugs.launchpad.net/tripleo/+bug/1780421>`_.