Merge "Turn on DHCP logging in ironic-inspector when debug is true"

releasenotes/notes/log-dhcp-700336a5fa27096d.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    When ``inspector::debug`` is set to ``true``, DHCP queries and responses
+    will be logged by the ironic-inspector dnsmasq services.

spec/classes/ironic_inspector_spec.rb

@@ -227,6 +227,12 @@ describe 'ironic::inspector' do
         is_expected.to contain_file('/etc/ironic-inspector/dnsmasq.conf').with_content(
             /dhcp-range=192.168.0.100,192.168.0.120,10m/
         )
+        is_expected.to contain_file('/etc/ironic-inspector/dnsmasq.conf').with_content(
+            /log-dhcp/
+        )
+        is_expected.to contain_file('/etc/ironic-inspector/dnsmasq.conf').with_content(
+            /log-queries/
+        )
       end
       it 'should contain file /var/www/httpboot/inspector.ipxe' do
         is_expected.to contain_file('/var/www/httpboot/inspector.ipxe').with(

templates/inspector_dnsmasq_http.erb

@@ -1,6 +1,10 @@
 port=0
 interface=<%= @dnsmasq_interface %>
 bind-interfaces
+<% if @debug %>
+log-dhcp
+log-queries
+<% end %>
 <% @dnsmasq_ip_subnets_real.each do |s| -%>
 <% if s['tag'] and s['netmask'] -%>
 dhcp-range=set:<%= s['tag'] -%>,<%= s['ip_range'] -%>,<%= s['netmask'] -%>,10m

templates/inspector_dnsmasq_tftp.erb

@@ -1,6 +1,10 @@
 port=0
 interface=<%= @dnsmasq_interface %>
 bind-interfaces
+<% if @debug %>
+log-dhcp
+log-queries
+<% end %>
 <% @dnsmasq_ip_subnets_real.each do |s| -%>
 <% if s['tag'] and s['netmask'] -%>
 dhcp-range=set:<%= s['tag'] -%>,<%= s['ip_range'] -%>,<%= s['netmask'] -%>,10m