From d559e2c39d2171e249ec4de3e29996fb25b20f3e Mon Sep 17 00:00:00 2001
From: Maksim Malchuk <maksim.malchuk@gmail.com>
Date: Fri, 8 Oct 2021 21:20:29 +0300
Subject: [PATCH] Update dnsmasq logging

This change adds the dnsmasq.log for the ironic-dnsmasq container and
also enables more verbose logging when debug logging enabled.
This can be triggered globbaly via 'openstack_logging_debug' or per
service via 'ironic_logging_debug' or 'neutron_logging_debug'.

Change-Id: I0e6b089beb88827effbcc365625eb2df902f5470
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
---
 .../roles/common/templates/conf/input/00-global.conf.j2    | 1 +
 ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2      | 6 ++++++
 ansible/roles/neutron/templates/dnsmasq.conf.j2            | 5 +++++
 .../notes/update-dnsmasq-logging-a5d42f6180aff049.yaml     | 7 +++++++
 4 files changed, 19 insertions(+)
 create mode 100644 releasenotes/notes/update-dnsmasq-logging-a5d42f6180aff049.yaml

diff --git a/ansible/roles/common/templates/conf/input/00-global.conf.j2 b/ansible/roles/common/templates/conf/input/00-global.conf.j2
index b7fba5068b..e31f1b9f6e 100644
--- a/ansible/roles/common/templates/conf/input/00-global.conf.j2
+++ b/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",
diff --git a/ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2 b/ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2
index 44e53e4da3..218ac8d44a 100644
--- a/ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2
+++ b/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 %}
diff --git a/ansible/roles/neutron/templates/dnsmasq.conf.j2 b/ansible/roles/neutron/templates/dnsmasq.conf.j2
index 91566c4185..d3d37206bd 100644
--- a/ansible/roles/neutron/templates/dnsmasq.conf.j2
+++ b/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 %}
diff --git a/releasenotes/notes/update-dnsmasq-logging-a5d42f6180aff049.yaml b/releasenotes/notes/update-dnsmasq-logging-a5d42f6180aff049.yaml
new file mode 100644
index 0000000000..c45622e197
--- /dev/null
+++ b/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.