From ac2bbcc9f19f039cc2414fe090029f37cf781176 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 13 Jan 2025 14:21:24 +0100 Subject: [PATCH] ironic: Fix dnsmasq.log permissions Closes-Bug: #2093881 Change-Id: I3f45178c07a9cd054e572ff80d0e19fb014d69d3 --- 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 a86ad0cbc1..fb1fe5db5b 100644 --- a/docker/dnsmasq/Dockerfile.j2 +++ b/docker/dnsmasq/Dockerfile.j2 @@ -12,5 +12,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.kolla_patch_sources() }} +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