aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2025-01-07 14:21:59 +0000
committerGerrit Code Review <review@openstack.org>2025-01-07 14:21:59 +0000
commitc781c66d2b4fe43d169794bb6e34d6a4d147579c (patch)
treeca096dc6f13fc9887c28328ba32c83898b9f0c3e
parentaa3e06cd33ef9a469d51d5da41e29d304e42fcfb (diff)
parent0f5e39954292a51e7a967d4015a6f024d6ba42f9 (diff)
downloadkolla-c781c66d2b4fe43d169794bb6e34d6a4d147579c.tar.gz
kolla-c781c66d2b4fe43d169794bb6e34d6a4d147579c.zip
Merge "neutron-dhcp-agent: change dnsmasq.log rights"
-rw-r--r--docker/neutron/neutron-dhcp-agent/Dockerfile.j22
-rw-r--r--docker/neutron/neutron-dhcp-agent/extend_start.sh9
2 files changed, 11 insertions, 0 deletions
diff --git a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2
index 34816335d..7353c2a2d 100644
--- a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2
@@ -14,6 +14,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.kolla_patch_sources() }}
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
{% block neutron_dhcp_agent_footer %}{% endblock %}
{% block footer %}{% endblock %}
diff --git a/docker/neutron/neutron-dhcp-agent/extend_start.sh b/docker/neutron/neutron-dhcp-agent/extend_start.sh
new file mode 100644
index 000000000..8becf549d
--- /dev/null
+++ b/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