From 18e6842285e167f493d73808e90d2bd7117f5975 Mon Sep 17 00:00:00 2001 From: Nicolas Haller Date: Thu, 13 Sep 2018 12:58:40 -0400 Subject: [PATCH] openvswitch: make ovs-tcpdump usable Change-Id: I5f18bd4bfe1243d79e4ee8ce56475e6c7c7cc986 Implements: blueprint ovs-tcpdump (cherry picked from commit f5c2f3d97cdb68a51aa22002d92fe250ff3ebc07) --- .../openvswitch/openvswitch-base/Dockerfile.j2 | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index 1d16e88723..f823dec06c 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -8,10 +8,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block ovs_install %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set openvswitch_base_packages = ['openvswitch'] %} + {% set openvswitch_base_packages = [ + 'openvswitch', + 'python-netifaces', + 'python-openvswitch', + 'tcpdump' + ] %} {% elif base_distro in ['debian', 'ubuntu'] %} - {% set openvswitch_base_packages = ['openvswitch-switch'] %} + {% set openvswitch_base_packages = [ + 'openvswitch-switch', + 'python-openvswitch', + 'python-netifaces', + 'tcpdump' + ] %} {% endif %} {{ macros.install_packages(openvswitch_base_packages | customizable("packages")) }} @@ -20,7 +30,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN touch /usr/local/bin/kolla_openvswitch_extend_start \ +RUN mv /usr/sbin/tcpdump /usr/bin/tcpdump \ + && touch /usr/local/bin/kolla_openvswitch_extend_start \ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_openvswitch_extend_start {% block openvswitch_base_footer %}{% endblock %}