Merge pull request #374 from stackhpc/upstream/2024.1-2025-01-20

Synchronise 2024.1 with upstream

Author: priteau

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 %}

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

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

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

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