Merge "Migrate to pyproject.toml"

8 files changed, 136 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 %}
diff --git a/kolla/docker/openvswitch/openvswitch-base/extend_start.sh b/kolla/docker/openvswitch/openvswitch-base/extend_start.sh
new file mode 100644
index 000000000..1b0ed1300
--- /dev/null
+++ b/kolla/docker/openvswitch/openvswitch-base/extend_start.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [[ ! -d "/var/log/kolla/openvswitch" ]]; then
+    mkdir -p /var/log/kolla/openvswitch
+fi
+if [[ $(stat -c %a /var/log/kolla/openvswitch) != "755" ]]; then
+    chmod 755 /var/log/kolla/openvswitch
+fi
+
+chown -R openvswitch:openvswitch /var/log/kolla/openvswitch
+
+. /usr/local/bin/kolla_openvswitch_extend_start
diff --git a/kolla/docker/openvswitch/openvswitch-base/ovs_wrapper.sh b/kolla/docker/openvswitch/openvswitch-base/ovs_wrapper.sh
new file mode 100644
index 000000000..552c496ac
--- /dev/null
+++ b/kolla/docker/openvswitch/openvswitch-base/ovs_wrapper.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+catch_term() {
+    ovs-appctl -T1 -t /run/openvswitch/$1.$child.ctl exit
+    exit 0
+}
+
+catch_quit() {
+    ovs-appctl -T1 -t /run/openvswitch/$1.$child.ctl exit
+    exit 0
+}
+
+trap catch_term SIGTERM
+trap catch_quit SIGQUIT
+
+"$@" &
+
+child=$!
+wait "$child"
diff --git a/kolla/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/kolla/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
new file mode 100644
index 000000000..869dbabb6
--- /dev/null
+++ b/kolla/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
@@ -0,0 +1,16 @@
+FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block openvswitch_db_server_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start
+RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start
+
+{{ macros.kolla_patch_sources() }}
+
+{% block openvswitch_db_server_footer %}{% endblock %}
+{% block footer %}{% endblock %}
diff --git a/kolla/docker/openvswitch/openvswitch-db-server/extend_start.sh b/kolla/docker/openvswitch/openvswitch-db-server/extend_start.sh
new file mode 100644
index 000000000..d25038bdd
--- /dev/null
+++ b/kolla/docker/openvswitch/openvswitch-db-server/extend_start.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+mkdir -p "/run/openvswitch"
+if [[ ! -e "/var/lib/openvswitch/conf.db" ]]; then
+    ovsdb-tool create "/var/lib/openvswitch/conf.db"
+fi
+
+if [[ $(ovsdb-tool needs-conversion /var/lib/openvswitch/conf.db) == yes ]]; then
+    ovsdb-tool convert "/var/lib/openvswitch/conf.db"
+fi
+
+if [[ ! -r "/var/log/kolla/openvswitch/ovsdb-server.log" ]]; then
+    touch /var/log/kolla/openvswitch/ovsdb-server.log
+    chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovsdb-server.log
+fi
diff --git a/kolla/docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml b/kolla/docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml
new file mode 100644
index 000000000..cc8daf1f4
--- /dev/null
+++ b/kolla/docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    ``openvswitch`` script ``ovs_ensure_configured.sh`` has been dropped after
+    being replaced with Ansible modules in ``kolla-ansible``.
diff --git a/kolla/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/kolla/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
new file mode 100644
index 000000000..fe6dd4347
--- /dev/null
+++ b/kolla/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
@@ -0,0 +1,16 @@
+FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block openvswitch_vswitchd_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start
+RUN chmod 644 /usr/local/bin/kolla_openvswitch_extend_start
+
+{{ macros.kolla_patch_sources() }}
+
+{% block openvswitch_vswitchd_footer %}{% endblock %}
+{% block footer %}{% endblock %}
diff --git a/kolla/docker/openvswitch/openvswitch-vswitchd/extend_start.sh b/kolla/docker/openvswitch/openvswitch-vswitchd/extend_start.sh
new file mode 100644
index 000000000..fde542130
--- /dev/null
+++ b/kolla/docker/openvswitch/openvswitch-vswitchd/extend_start.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [[ ! -r "/var/log/kolla/openvswitch/ovs-vswitchd.log" ]]; then
+    touch /var/log/kolla/openvswitch/ovs-vswitchd.log
+    chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovs-vswitchd.log
+fi
+
+modprobe openvswitch