Merge pull request #373 from stackhpc/upstream/2024.1-2025-01-13

Synchronise 2024.1 with upstream

Author: priteau

docker/neutron/neutron-dhcp-agent/Dockerfile.j2

@@ -12,6 +12,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.install_packages(neutron_dhcp_agent_packages | customizable("packages")) }}
 
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
 {% block neutron_dhcp_agent_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 

docker/neutron/neutron-dhcp-agent/extend_start.sh

@@ -0,0 +1,9 @@
+if [[ ! -d "/var/log/kolla/neutron" ]]; then
+    mkdir -p /var/log/kolla/neutron
+fi
+if [[ ! -f "/var/log/kolla/neutron/dnsmasq.log" ]]; then
+    touch /var/log/kolla/neutron/dnsmasq.log
+    chown neutron:kolla /var/log/kolla/neutron/dnsmasq.log
+fi
+
+. /usr/local/bin/kolla_neutron_extend_start