Merge "Update dnsmasq logging"

ansible/roles/common/templates/conf/input/00-global.conf.j2

@@ -7,6 +7,7 @@
                 "/var/log/kolla/monasca/grafana.log",
                 "/var/log/kolla/monasca/monasca-api.log",
                 "/var/log/kolla/neutron/dnsmasq.log",
+                "/var/log/kolla/ironic/dnsmasq.log",
                 "/var/log/kolla/*/*-access.log",
                 "/var/log/kolla/*/*-error.log",
                 "/var/log/kolla/*/*_access.log",

ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2

@@ -31,6 +31,12 @@ dhcp-option=tag:efi,tag:!ipxe,option:bootfile-name,ipxe.efi
 dhcp-option=option:bootfile-name,{{ ironic_dnsmasq_boot_file }}
 {% endif %}{# ipv6/ipv4 #}
 
+log-async
+log-facility=/var/log/kolla/ironic/dnsmasq.log
+{% if ironic_logging_debug | bool %}
+log-dhcp
+{% endif %}
+
 {% if ironic_inspector_pxe_filter == 'dnsmasq' %}
 dhcp-hostsdir=/etc/dnsmasq/dhcp-hostsdir
 {% endif %}

ansible/roles/neutron/templates/dnsmasq.conf.j2

@@ -1 +1,6 @@
+log-async
 log-facility=/var/log/kolla/neutron/dnsmasq.log
+{% if neutron_logging_debug | bool %}
+log-dhcp
+log-queries
+{% endif %}

releasenotes/notes/update-dnsmasq-logging-a5d42f6180aff049.yaml

@@ -0,0 +1,7 @@
+---
+other:
+  - |
+    The container ``ironic-dnsmasq`` now creates the ``dnsmasq.log`` just as
+    the container ``neutron-dhcp-agent``. For both log files verbosity can be
+    increased globally via ``openstack_logging_debug`` or per service via
+    ``ironic_logging_debug`` or ``neutron_logging_debug`` variables.