Merge "Migrate to pyproject.toml"

1 files changed, 45 insertions, 0 deletions

diff --git a/kolla/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/kolla/docker/openvswitch/openvswitch-base/Dockerfile.j2
new file mode 100644
index 000000000..44d8df41c
--- /dev/null
+++ b/kolla/docker/openvswitch/openvswitch-base/Dockerfile.j2
@@ -0,0 +1,45 @@
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block openvswitch_base_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% block ovs_install %}
+
+{% if base_package_type == 'rpm' %}
+
+{{ macros.enable_extra_repos(['openvswitch']) }}
+
+    {% set openvswitch_base_packages = [
+        'libibverbs',
+        'openvswitch${KOLLA_RPM_OVS_VERSION}',
+        'python3-openvswitch${KOLLA_RPM_OVS_VERSION}',
+        'tcpdump'
+    ] %}
+{% elif base_package_type == 'deb' %}
+    {% set openvswitch_base_packages = [
+        'openvswitch-switch',
+        'python3-openvswitch',
+        'tcpdump'
+    ] %}
+{% endif %}
+
+{{ macros.install_packages(openvswitch_base_packages | customizable("packages")) }}
+
+{% 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 755 /usr/local/bin/ovs_wrapper
+
+{{ macros.kolla_patch_sources() }}
+
+{% block openvswitch_base_footer %}{% endblock %}