aboutsummaryrefslogtreecommitdiff
path: root/docker/ovn
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2026-07-06 15:26:00 +0200
committerMichal Nasiadka <mnasiadka@gmail.com>2026-07-06 19:59:40 +0000
commitdb35ac8d793506bc43b62e7e39d27a75de1043ed (patch)
treefeec28d13a43490f5fd4260374144a1abfc20331 /docker/ovn
parent1ae1850557e3b99902f73b32c9005618537a1f2d (diff)
downloadkolla-db35ac8d793506bc43b62e7e39d27a75de1043ed.tar.gz
kolla-db35ac8d793506bc43b62e7e39d27a75de1043ed.zip
Migrate to pyproject.toml
[tool.setuptools.data-files] does not support recursive directory installation. The old setup.cfg [files] worked because PBR's FilesConfig.expand_globs() used os.walk() to expand docker/*, but this hook is not triggered by the pbr.build PEP-517 backend. Move docker/ into kolla/ and use [tool.setuptools.package-data] instead. Update kolla_worker._get_images_dir() to check the kolla package directory first so both editable and regular installs work. Change-Id: I4fc452c03740ef22ebbb4e8d0d86c4f4783e2d09 Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'docker/ovn')
-rw-r--r--docker/ovn/ovn-base/Dockerfile.j229
-rw-r--r--docker/ovn/ovn-base/extend_start.sh13
-rw-r--r--docker/ovn/ovn-controller/Dockerfile.j229
-rw-r--r--docker/ovn/ovn-controller/extend_start.sh6
-rw-r--r--docker/ovn/ovn-nb-db-server/Dockerfile.j231
-rw-r--r--docker/ovn/ovn-nb-db-server/extend_start.sh6
-rwxr-xr-xdocker/ovn/ovn-nb-db-server/start_nb_db_server.sh28
-rw-r--r--docker/ovn/ovn-northd/Dockerfile.j229
-rw-r--r--docker/ovn/ovn-northd/extend_start.sh5
-rw-r--r--docker/ovn/ovn-sb-db-relay/Dockerfile.j218
-rw-r--r--docker/ovn/ovn-sb-db-relay/extend_start.sh6
-rw-r--r--docker/ovn/ovn-sb-db-server/Dockerfile.j231
-rw-r--r--docker/ovn/ovn-sb-db-server/extend_start.sh6
-rwxr-xr-xdocker/ovn/ovn-sb-db-server/start_sb_db_server.sh29
14 files changed, 0 insertions, 266 deletions
diff --git a/docker/ovn/ovn-base/Dockerfile.j2 b/docker/ovn/ovn-base/Dockerfile.j2
deleted file mode 100644
index 3efd001a3..000000000
--- a/docker/ovn/ovn-base/Dockerfile.j2
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block ovn_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
- {% set ovn_base_packages = [
- 'ovn${KOLLA_RPM_OVN_VERSION}',
- ] %}
-
-{% elif base_package_type == 'deb' %}
- {% set ovn_base_packages = [
- 'ovn-common',
- ] %}
-
-{% endif %}
-{{ macros.install_packages(ovn_base_packages | customizable("packages")) }}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN chmod 644 /usr/local/bin/kolla_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block ovn_base_footer %}{% endblock %}
diff --git a/docker/ovn/ovn-base/extend_start.sh b/docker/ovn/ovn-base/extend_start.sh
deleted file mode 100644
index eae4ab9e1..000000000
--- a/docker/ovn/ovn-base/extend_start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/run/ovn" ]]; then
- mkdir -p /run/ovn
-fi
-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
-
-. /usr/local/bin/kolla_ovn_extend_start
diff --git a/docker/ovn/ovn-controller/Dockerfile.j2 b/docker/ovn/ovn-controller/Dockerfile.j2
deleted file mode 100644
index f95e61fee..000000000
--- a/docker/ovn/ovn-controller/Dockerfile.j2
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block ovn_controller_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
- {% set ovn_controller_packages = [
- 'ovn${KOLLA_RPM_OVN_VERSION}-host'
- ] %}
-
-{% elif base_package_type == 'deb' %}
- {% set ovn_controller_packages = [
- 'ovn-host'
- ] %}
-
-{% endif %}
-{{ macros.install_packages(ovn_controller_packages | customizable("packages")) }}
-
-COPY extend_start.sh /usr/local/bin/kolla_ovn_extend_start
-RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block ovn_controller_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/ovn/ovn-controller/extend_start.sh b/docker/ovn/ovn-controller/extend_start.sh
deleted file mode 100644
index 8080ea7c8..000000000
--- a/docker/ovn/ovn-controller/extend_start.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-if [[ ! -r "/var/log/kolla/openvswitch/ovn-controller.log" ]]; then
- touch /var/log/kolla/openvswitch/ovn-controller.log
- chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovn-controller.log
-fi
diff --git a/docker/ovn/ovn-nb-db-server/Dockerfile.j2 b/docker/ovn/ovn-nb-db-server/Dockerfile.j2
deleted file mode 100644
index ea6a53249..000000000
--- a/docker/ovn/ovn-nb-db-server/Dockerfile.j2
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block ovn_nb_db_server_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
- {% set ovn_nb_db_server_packages = [
- 'ovn${KOLLA_RPM_OVN_VERSION}-central',
- ] %}
-
-{% elif base_package_type == 'deb' %}
- {% set ovn_nb_db_server_packages = [
- 'ovn-central',
- ] %}
-
-{% endif %}
-{{ macros.install_packages(ovn_nb_db_server_packages | customizable("packages")) }}
-
-COPY start_nb_db_server.sh /usr/local/bin/start-nb-db-server
-RUN chmod 755 /usr/local/bin/start-nb-db-server
-COPY extend_start.sh /usr/local/bin/kolla_ovn_extend_start
-RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block ovn_nb_db_server_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/ovn/ovn-nb-db-server/extend_start.sh b/docker/ovn/ovn-nb-db-server/extend_start.sh
deleted file mode 100644
index 4c0e742f5..000000000
--- a/docker/ovn/ovn-nb-db-server/extend_start.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-if [[ ! -r "/var/log/kolla/openvswitch/ovn-nb-db.log" ]]; then
- touch /var/log/kolla/openvswitch/ovn-nb-db.log
- chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovn-nb-db.log
-fi
diff --git a/docker/ovn/ovn-nb-db-server/start_nb_db_server.sh b/docker/ovn/ovn-nb-db-server/start_nb_db_server.sh
deleted file mode 100755
index d08dd2890..000000000
--- a/docker/ovn/ovn-nb-db-server/start_nb_db_server.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# All the option passed to this script will be
-# passed to the ovn-ctl script. Please see the options
-# supported by ovn-ctl script -
-# https://github.com/ovn-org/ovn/blob/master/utilities/ovn-ctl
-args=$@
-
-# Use ovn-ctl script to start ovn NB db server as it
-# takes care of creating the db file from the schema
-# file if the db file is not present. It also takes care
-# of updating the db file if the schema file is updated.
-
-# Check for the presence of ovn-ctl script in two locations.
-# If latest OVN is used (post split from openvswitch),
-# then the new location for the ovn-ctl script is
-# is - /usr/share/ovn/scripts/ovn-ctl. Otherwise it is
-# /usr/share/openvswitch/scripts/ovn-ctl.
-
-if [[ -f "/usr/share/openvswitch/scripts/ovn-ctl" ]]; then
- set /usr/share/openvswitch/scripts/ovn-ctl --no-monitor
-elif [[ -f "/usr/share/ovn/scripts/ovn-ctl" ]]; then
- set /usr/share/ovn/scripts/ovn-ctl --no-monitor
-else
- exit 1
-fi
-
-$@ $args run_nb_ovsdb
diff --git a/docker/ovn/ovn-northd/Dockerfile.j2 b/docker/ovn/ovn-northd/Dockerfile.j2
deleted file mode 100644
index 4a15e10eb..000000000
--- a/docker/ovn/ovn-northd/Dockerfile.j2
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block ovn_northd_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
- {% set ovn_northd_packages = [
- 'ovn${KOLLA_RPM_OVN_VERSION}-central',
- ] %}
-
-{% elif base_package_type == 'deb' %}
- {% set ovn_northd_packages = [
- 'ovn-central',
- ] %}
-
-{% endif %}
-{{ macros.install_packages(ovn_northd_packages | customizable("packages")) }}
-
-COPY extend_start.sh /usr/local/bin/kolla_ovn_extend_start
-RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block ovn_northd_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/ovn/ovn-northd/extend_start.sh b/docker/ovn/ovn-northd/extend_start.sh
deleted file mode 100644
index c832c5383..000000000
--- a/docker/ovn/ovn-northd/extend_start.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-if [[ ! -r "/var/log/kolla/openvswitch/ovn-northd.log" ]]; then
- touch /var/log/kolla/openvswitch/ovn-northd.log
- chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovn-northd.log
-fi
diff --git a/docker/ovn/ovn-sb-db-relay/Dockerfile.j2 b/docker/ovn/ovn-sb-db-relay/Dockerfile.j2
deleted file mode 100644
index 427b6f7f1..000000000
--- a/docker/ovn/ovn-sb-db-relay/Dockerfile.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}ovn-sb-db-server:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block ovn_sb_db_server_header %}{% endblock %}
-
-{% block ovn_sb_db_relay_ovn_ctl %}
-{# TODO(mnasiadka): Switch to 25.03 branch when available, ideally rpm/deb packages will be
- available. #}
-RUN curl -o /usr/share/ovn/scripts/ovn-ctl https://raw.githubusercontent.com/ovn-org/ovn/refs/heads/main/utilities/ovn-ctl
-{% endblock %}
-
-COPY extend_start.sh /usr/local/bin/kolla_ovn_extend_start
-RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
-
-{% block ovn_sb_db_relay_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/ovn/ovn-sb-db-relay/extend_start.sh b/docker/ovn/ovn-sb-db-relay/extend_start.sh
deleted file mode 100644
index 04b6c5357..000000000
--- a/docker/ovn/ovn-sb-db-relay/extend_start.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-if [[ ! -r "/var/log/kolla/openvswitch/ovn-sb-relay-${RELAY_ID}.log" ]]; then
- touch /var/log/kolla/openvswitch/ovn-sb-relay-${RELAY_ID}.log
- chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovn-sb-relay-${RELAY_ID}.log
-fi
diff --git a/docker/ovn/ovn-sb-db-server/Dockerfile.j2 b/docker/ovn/ovn-sb-db-server/Dockerfile.j2
deleted file mode 100644
index afceb8173..000000000
--- a/docker/ovn/ovn-sb-db-server/Dockerfile.j2
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
-{% endblock %}
-
-{% block ovn_sb_db_server_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
- {% set ovn_sb_db_server_packages = [
- 'ovn${KOLLA_RPM_OVN_VERSION}-central',
- ] %}
-
-{% elif base_package_type == 'deb' %}
- {% set ovn_sb_db_server_packages = [
- 'ovn-central',
- ] %}
-
-{% endif %}
-{{ macros.install_packages(ovn_sb_db_server_packages | customizable("packages")) }}
-
-COPY start_sb_db_server.sh /usr/local/bin/start-sb-db-server
-RUN chmod 755 /usr/local/bin/start-sb-db-server
-COPY extend_start.sh /usr/local/bin/kolla_ovn_extend_start
-RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block ovn_sb_db_server_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/ovn/ovn-sb-db-server/extend_start.sh b/docker/ovn/ovn-sb-db-server/extend_start.sh
deleted file mode 100644
index 07bcd1b45..000000000
--- a/docker/ovn/ovn-sb-db-server/extend_start.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-if [[ ! -r "/var/log/kolla/openvswitch/ovn-sb-db.log" ]]; then
- touch /var/log/kolla/openvswitch/ovn-sb-db.log
- chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovn-sb-db.log
-fi
diff --git a/docker/ovn/ovn-sb-db-server/start_sb_db_server.sh b/docker/ovn/ovn-sb-db-server/start_sb_db_server.sh
deleted file mode 100755
index ef39b8d25..000000000
--- a/docker/ovn/ovn-sb-db-server/start_sb_db_server.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# All the option passed to this script will be
-# passed to the ovn-ctl script. Please see the options
-# supported by ovn-ctl script -
-# https://github.com/ovn-org/ovn/blob/master/utilities/ovn-ctl
-args=$@
-
-# Use ovn-ctl script to start ovn SB db server as it
-# takes care of creating the db file from the schema
-# file if the db file is not present. It also takes care
-# of updating the db file if the schema file is updated.
-
-# Check for the presence of ovn-ctl script in two locations.
-# If latest OVN is used (post split from openvswitch),
-# then the new location for the ovn-ctl script is
-# is - /usr/share/ovn/scripts/ovn-ctl. Otherwise it is
-# /usr/share/openvswitch/scripts/ovn-ctl.
-
-
-if [[ -f "/usr/share/openvswitch/scripts/ovn-ctl" ]]; then
- set /usr/share/openvswitch/scripts/ovn-ctl --no-monitor
-elif [[ -f "/usr/share/ovn/scripts/ovn-ctl" ]]; then
- set /usr/share/ovn/scripts/ovn-ctl --no-monitor
-else
- exit 1
-fi
-
-$@ $args run_sb_ovsdb