From 8a856586c415220453101c37d8a65f2d278cb371 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Mon, 13 Jan 2025 14:21:24 +0100
Subject: [PATCH 1/2] ironic: Fix dnsmasq.log permissions

Closes-Bug: #2093881
Change-Id: I3f45178c07a9cd054e572ff80d0e19fb014d69d3
(cherry picked from commit ac2bbcc9f19f039cc2414fe090029f37cf781176)
---
 docker/dnsmasq/Dockerfile.j2   |  3 +++
 docker/dnsmasq/extend_start.sh | 12 ++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 docker/dnsmasq/extend_start.sh

diff --git a/docker/dnsmasq/Dockerfile.j2 b/docker/dnsmasq/Dockerfile.j2
index d7de0680f2..40ecf3356b 100644
--- a/docker/dnsmasq/Dockerfile.j2
+++ b/docker/dnsmasq/Dockerfile.j2
@@ -10,5 +10,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% set dnsmasq_packages = ['dnsmasq'] %}
 {{ macros.install_packages(dnsmasq_packages| customizable("packages")) }}
 
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+RUN chmod 644 /usr/local/bin/kolla_extend_start
+
 {% block dnsmasq_footer %}{% endblock %}
 {% block footer %}{% endblock %}
diff --git a/docker/dnsmasq/extend_start.sh b/docker/dnsmasq/extend_start.sh
new file mode 100644
index 0000000000..c09ce03273
--- /dev/null
+++ b/docker/dnsmasq/extend_start.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [[ ! -d "/var/log/kolla/ironic" ]]; then
+    mkdir -p /var/log/kolla/ironic
+fi
+if [[ $(stat -c %a /var/log/kolla/ironic) != "755" ]]; then
+    chmod 755 /var/log/kolla/ironic
+fi
+if [[ ! -r "/var/log/kolla/ironic/dnsmasq.log" ]]; then
+    touch /var/log/kolla/ironic/dnsmasq.log
+    chown ironic:ironic /var/log/kolla/ironic/dnsmasq.log
+fi

From 771272100b9f66df4ea15fc9cbc5c4e86682c0d5 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Mon, 13 Jan 2025 09:54:25 +0100
Subject: [PATCH 2/2] openvswitch: Fix logs dir permission

Closes-Bug: #1795609

Change-Id: Iedfb2df027c0cefc45668a76d45ce62193aba9ef
(cherry picked from commit a9c94abf530f3ed36b9b3f10c89549f04af26df4)
---
 docker/openvswitch/openvswitch-base/extend_start.sh      | 2 ++
 docker/openvswitch/openvswitch-db-server/extend_start.sh | 5 +++++
 docker/openvswitch/openvswitch-vswitchd/extend_start.sh  | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/docker/openvswitch/openvswitch-base/extend_start.sh b/docker/openvswitch/openvswitch-base/extend_start.sh
index 767194e04b..1b0ed1300a 100644
--- a/docker/openvswitch/openvswitch-base/extend_start.sh
+++ b/docker/openvswitch/openvswitch-base/extend_start.sh
@@ -7,4 +7,6 @@ if [[ $(stat -c %a /var/log/kolla/openvswitch) != "755" ]]; then
     chmod 755 /var/log/kolla/openvswitch
 fi
 
+chown -R openvswitch:openvswitch /var/log/kolla/openvswitch
+
 . /usr/local/bin/kolla_openvswitch_extend_start
diff --git a/docker/openvswitch/openvswitch-db-server/extend_start.sh b/docker/openvswitch/openvswitch-db-server/extend_start.sh
index 6bb04af163..d25038bddc 100644
--- a/docker/openvswitch/openvswitch-db-server/extend_start.sh
+++ b/docker/openvswitch/openvswitch-db-server/extend_start.sh
@@ -8,3 +8,8 @@ fi
 if [[ $(ovsdb-tool needs-conversion /var/lib/openvswitch/conf.db) == yes ]]; then
     ovsdb-tool convert "/var/lib/openvswitch/conf.db"
 fi
+
+if [[ ! -r "/var/log/kolla/openvswitch/ovsdb-server.log" ]]; then
+    touch /var/log/kolla/openvswitch/ovsdb-server.log
+    chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovsdb-server.log
+fi
diff --git a/docker/openvswitch/openvswitch-vswitchd/extend_start.sh b/docker/openvswitch/openvswitch-vswitchd/extend_start.sh
index e2fc554650..fde5421309 100644
--- a/docker/openvswitch/openvswitch-vswitchd/extend_start.sh
+++ b/docker/openvswitch/openvswitch-vswitchd/extend_start.sh
@@ -1,3 +1,8 @@
 #!/bin/bash
 
+if [[ ! -r "/var/log/kolla/openvswitch/ovs-vswitchd.log" ]]; then
+    touch /var/log/kolla/openvswitch/ovs-vswitchd.log
+    chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovs-vswitchd.log
+fi
+
 modprobe openvswitch