From 426744a271b1a081b6967c071815b1ed9c49108c Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 10 Jan 2024 07:59:11 +0100 Subject: openvswitch: Add ovs_wrapper for handling TERM Partial-Bug: #2048130 Change-Id: I81eba2644eda6edd38c541f798bead04c2fa6578 --- docker/openvswitch/openvswitch-base/Dockerfile.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docker/openvswitch/openvswitch-base/Dockerfile.j2') diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index 5ae3dc15b..52ee47a44 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -33,10 +33,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% endblock %} COPY extend_start.sh /usr/local/bin/kolla_extend_start +COPY ovs_wrapper.sh /usr/local/bin/ovs_wrapper # NOTE(hrw): Upstream moved tcpdump to /usr/bin/ in 4.99 version (used in Debian) RUN if [ -e /usr/sbin/tcpdump ]; then mv /usr/sbin/tcpdump /usr/bin/tcpdump; fi \ && touch /usr/local/bin/kolla_openvswitch_extend_start \ - && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_openvswitch_extend_start + && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_openvswitch_extend_start \ + && chmod 755 /usr/local/bin/ovs_wrapper {% block openvswitch_base_footer %}{% endblock %} -- cgit v1.2.3