From 33f9b51ecfa75c92af13d1c3f52e5359adb61ae8 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Thu, 17 Nov 2022 09:33:05 +1300
Subject: [PATCH] Restore discovery for dnsmasq dhcp provider

The dnsmasq dhcp provider will only create rules for explicit hosts,
so the fallback directives are still needed to support autodiscovery
for other hosts.

This change adds the enable_inspector_discovery parameter to the
conditional surrounding the fallback directives.

Story: 2010203
Task: 45923

Change-Id: I2d0cdf955a43b7f19a1e01bedd6974f8e350e270
---
 .../roles/bifrost-ironic-install/templates/dnsmasq.conf.j2      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playbooks/roles/bifrost-ironic-install/templates/dnsmasq.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/dnsmasq.conf.j2
index 83252f594..5c410f770 100644
--- a/playbooks/roles/bifrost-ironic-install/templates/dnsmasq.conf.j2
+++ b/playbooks/roles/bifrost-ironic-install/templates/dnsmasq.conf.j2
@@ -90,7 +90,7 @@ dhcp-option=42,{{dnsmasq_ntp_servers}}
 dhcp-match=set:ipxe,175 # iPXE sends a 175 option.
 
 dhcp-optsdir={{ dnsmasq_dhcp_optsdir }}
-{% if dhcp_provider == 'none' %}
+{% if dhcp_provider == 'none' or enable_inspector_discovery | bool %}
 # Boot for Etherboot gPXE. The idea is to send two different
 # filenames, the first loads gPXE, and the second tells gPXE what to
 # load. The dhcp-match sets the gpxe tag for requests from gPXE.