diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2026-04-24 19:11:48 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2026-04-24 19:12:29 +0200 |
| commit | 77b92c33f979ad5ae4321a1b3604ce90a99415a1 (patch) | |
| tree | fc7c72debd80e4742a457def77e95923845933fb /docker | |
| parent | 90cfc97e5bea5a4800e46d4af64ca352f561f11c (diff) | |
| download | kolla-77b92c33f979ad5ae4321a1b3604ce90a99415a1.tar.gz kolla-77b92c33f979ad5ae4321a1b3604ce90a99415a1.zip | |
Drop zun and kuryr
Zun is broken in 2026.1, it has been released broken and there are
no reviews on the patch to fix it [1].
[1]: https://review.opendev.org/c/openstack/zun/+/982362
Change-Id: I770b9e62c66f8cc63475d51f80eecacc8415b91f
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 | ||||
| -rw-r--r-- | docker/kuryr/kuryr-base/Dockerfile.j2 | 30 | ||||
| -rw-r--r-- | docker/kuryr/kuryr-base/extend_start.sh | 15 | ||||
| -rw-r--r-- | docker/kuryr/kuryr-libnetwork/Dockerfile.j2 | 40 | ||||
| -rw-r--r-- | docker/zun/zun-api/Dockerfile.j2 | 16 | ||||
| -rw-r--r-- | docker/zun/zun-api/extend_start.sh | 10 | ||||
| -rw-r--r-- | docker/zun/zun-base/Dockerfile.j2 | 56 | ||||
| -rw-r--r-- | docker/zun/zun-base/app.wsgi | 2 | ||||
| -rw-r--r-- | docker/zun/zun-base/extend_start.sh | 13 | ||||
| -rw-r--r-- | docker/zun/zun-base/zun_sudoers | 1 | ||||
| -rw-r--r-- | docker/zun/zun-cni-daemon/Dockerfile.j2 | 42 | ||||
| -rw-r--r-- | docker/zun/zun-cni-daemon/zun_sudoers | 1 | ||||
| -rw-r--r-- | docker/zun/zun-compute/Dockerfile.j2 | 37 | ||||
| -rw-r--r-- | docker/zun/zun-compute/extend_start.sh | 5 | ||||
| -rw-r--r-- | docker/zun/zun-compute/zun_sudoers | 3 | ||||
| -rw-r--r-- | docker/zun/zun-wsproxy/Dockerfile.j2 | 15 |
16 files changed, 0 insertions, 295 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index dae3ae2db..59d6b19d6 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -184,14 +184,6 @@ function config_watcher_dashboard { "/etc/openstack-dashboard/watcher_policy.json" } -function config_zun_dashboard { - for file in ${SITE_PACKAGES}/zun_ui/enabled/_*[^__].py; do - config_dashboard "${ENABLE_ZUN:-no}" \ - "${SITE_PACKAGES}/zun_ui/enabled/${file##*/}" \ - "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" - done -} - # Regenerate the compressed javascript and css if any configuration files have # changed. Use a static modification date when generating the tarball # so that we only trigger on content changes. @@ -229,7 +221,6 @@ config_octavia_dashboard config_tacker_dashboard config_trove_dashboard config_watcher_dashboard -config_zun_dashboard if settings_changed; then ${MANAGE_PY} collectstatic --noinput --clear diff --git a/docker/kuryr/kuryr-base/Dockerfile.j2 b/docker/kuryr/kuryr-base/Dockerfile.j2 deleted file mode 100644 index 025e0cdf6..000000000 --- a/docker/kuryr/kuryr-base/Dockerfile.j2 +++ /dev/null @@ -1,30 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block kuryr_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='kuryr') }} - -ADD kuryr-base-archive /kuryr-base-source - -{% set kuryr_base_pip_packages = [ - '/kuryr-base' -] %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -# NOTE(Jeffrey4l): remove kuryr-lib constraint in upper-constraints.txt file. -# Otherwise, it will be failed. -RUN ln -s kuryr-base-source/* kuryr-base \ - && {{ macros.upper_constraints_remove("kuryr-lib") }} \ - && {{ macros.install_pip(kuryr_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/kuryr \ - && chmod 644 /usr/local/bin/kolla_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block kuryr_base_footer %}{% endblock %} diff --git a/docker/kuryr/kuryr-base/extend_start.sh b/docker/kuryr/kuryr-base/extend_start.sh deleted file mode 100644 index b109ce4f6..000000000 --- a/docker/kuryr/kuryr-base/extend_start.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -KURYR_LOG_DIR=/var/log/kolla/kuryr -KURYR_DOCKER_PLUGINS_DIR=/usr/lib/docker/plugins/kuryr - -if [[ ! -d "${KURYR_LOG_DIR}" ]]; then - mkdir -p ${KURYR_LOG_DIR} -fi -if [[ $(stat -c %a ${KURYR_LOG_DIR}) != "755" ]]; then - chmod 755 ${KURYR_LOG_DIR} -fi - -if [[ ! -d "${KURYR_DOCKER_PLUGINS_DIR}" ]]; then - mkdir -p ${KURYR_DOCKER_PLUGINS_DIR} -fi diff --git a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 deleted file mode 100644 index 8764cbb84..000000000 --- a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 +++ /dev/null @@ -1,40 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}kuryr-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block kuryr_libnetwork_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - -{{ macros.enable_extra_repos(['openvswitch']) }} - - {% set kuryr_libnetwork_packages = [ - 'openvswitch${KOLLA_RPM_OVS_VERSION}' - ] %} - -{% elif base_package_type == 'deb' %} - - {% set kuryr_libnetwork_packages = [ - 'bridge-utils', - 'openvswitch-switch' - ] %} - -{% endif %} -{{ macros.install_packages(kuryr_libnetwork_packages | customizable("packages")) }} - -ADD kuryr-libnetwork-archive /kuryr-libnetwork-source - -{% set kuryr_libnetwork_pip_packages = [ - '/kuryr-libnetwork' -] %} - -RUN ln -s kuryr-libnetwork-source/* kuryr-libnetwork \ - && {{ macros.install_pip(kuryr_libnetwork_pip_packages | customizable("pip_packages")) }} - -{{ macros.kolla_patch_sources() }} - -{% block kuryr_libnetwork_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/zun/zun-api/Dockerfile.j2 b/docker/zun/zun-api/Dockerfile.j2 deleted file mode 100644 index ded752ae6..000000000 --- a/docker/zun/zun-api/Dockerfile.j2 +++ /dev/null @@ -1,16 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block zun_api_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -COPY extend_start.sh /usr/local/bin/kolla_zun_extend_start -RUN chmod 644 /usr/local/bin/kolla_zun_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block zun_api_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/zun/zun-api/extend_start.sh b/docker/zun/zun-api/extend_start.sh deleted file mode 100644 index f21cc1bd3..000000000 --- a/docker/zun/zun-api/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases -# of the KOLLA_BOOTSTRAP variable being set, including empty. -if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - zun-db-manage upgrade - exit 0 -fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/zun/zun-base/Dockerfile.j2 b/docker/zun/zun-base/Dockerfile.j2 deleted file mode 100644 index b6eac1907..000000000 --- a/docker/zun/zun-base/Dockerfile.j2 +++ /dev/null @@ -1,56 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block zun_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='zun') }} - -{% if base_package_type == 'rpm' %} - -{{ macros.enable_extra_repos(['openvswitch']) }} - - {% set zun_base_packages = [ - 'numactl', - ] %} - -{{ macros.install_packages(zun_base_packages | customizable("packages")) }} -RUN mkdir -p /var/www/cgi-bin/zun - -{% elif base_package_type == 'deb' %} - - {% set zun_base_packages = [ - 'numactl', - ] %} - -{{ macros.install_packages(zun_base_packages | customizable("packages")) }} -RUN mkdir -p /var/www/cgi-bin/zun -{% endif %} - -ADD zun-base-archive /zun-base-source - -{% set zun_base_pip_packages = [ - '/zun' -] %} - -COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers -COPY extend_start.sh /usr/local/bin/kolla_extend_start -COPY app.wsgi /var/www/cgi-bin/zun - -RUN ln -s zun-base-source/* zun \ - && {{ macros.install_pip(zun_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/zun /var/www/cgi-bin/zun \ - && cp -r /zun/etc/zun/* /etc/zun/ \ - && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/zun/rootwrap.conf \ - && chmod 750 /etc/sudoers.d \ - && chmod 640 /etc/sudoers.d/kolla_zun_sudoers \ - && touch /usr/local/bin/kolla_zun_extend_start \ - && chmod 755 /var/www/cgi-bin/zun \ - && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_zun_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block zun_base_footer %}{% endblock %} diff --git a/docker/zun/zun-base/app.wsgi b/docker/zun/zun-base/app.wsgi deleted file mode 100644 index bd64371de..000000000 --- a/docker/zun/zun-base/app.wsgi +++ /dev/null @@ -1,2 +0,0 @@ -#!/var/lib/kolla/venv/bin/python -from zun.wsgi.api import application diff --git a/docker/zun/zun-base/extend_start.sh b/docker/zun/zun-base/extend_start.sh deleted file mode 100644 index 0a8cf1331..000000000 --- a/docker/zun/zun-base/extend_start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/zun" ]]; then - mkdir -p /var/log/kolla/zun -fi -if [[ $(stat -c %U:%G /var/log/kolla/zun) != "zun:kolla" ]]; then - chown zun:kolla /var/log/kolla/zun -fi -if [[ $(stat -c %a /var/log/kolla/zun) != "755" ]]; then - chmod 755 /var/log/kolla/zun -fi - -. /usr/local/bin/kolla_zun_extend_start diff --git a/docker/zun/zun-base/zun_sudoers b/docker/zun/zun-base/zun_sudoers deleted file mode 100644 index fd35f4cb5..000000000 --- a/docker/zun/zun-base/zun_sudoers +++ /dev/null @@ -1 +0,0 @@ -zun ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/zun-rootwrap /etc/zun/rootwrap.conf * diff --git a/docker/zun/zun-cni-daemon/Dockerfile.j2 b/docker/zun/zun-cni-daemon/Dockerfile.j2 deleted file mode 100644 index 3534f8f3e..000000000 --- a/docker/zun/zun-cni-daemon/Dockerfile.j2 +++ /dev/null @@ -1,42 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block zun_cni_daemon_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - - {% set zun_cni_daemon_packages = [ - 'openvswitch${KOLLA_RPM_OVS_VERSION}' - ] %} - -{% elif base_package_type == 'deb' %} - - {% set zun_cni_daemon_packages = [ - 'bridge-utils', - 'openvswitch-switch' - ] %} - -{% endif %} -{{ macros.install_packages(zun_cni_daemon_packages | customizable("packages")) }} - -{% block zun_cni_daemon_version %} -ARG zun_cni_daemon_version=0.7.1 -ARG zun_cni_daemon_url=https://github.com/containernetworking/plugins/releases/download/v${zun_cni_daemon_version}/cni-plugins-{{debian_arch}}-v${zun_cni_daemon_version}.tgz -{% endblock %} - -COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers - -RUN chmod 750 /etc/sudoers.d \ - && chmod 640 /etc/sudoers.d/kolla_zun_sudoers \ - && curl -o /tmp/cni-plugins.tgz ${zun_cni_daemon_url} \ - && tar -C /opt -xzvf /tmp/cni-plugins.tgz ./loopback \ - && rm -f /tmp/cni-plugins.tgz - -{{ macros.kolla_patch_sources() }} - -{% block zun_cni_daemon_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/zun/zun-cni-daemon/zun_sudoers b/docker/zun/zun-cni-daemon/zun_sudoers deleted file mode 100644 index fd35f4cb5..000000000 --- a/docker/zun/zun-cni-daemon/zun_sudoers +++ /dev/null @@ -1 +0,0 @@ -zun ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/zun-rootwrap /etc/zun/rootwrap.conf * diff --git a/docker/zun/zun-compute/Dockerfile.j2 b/docker/zun/zun-compute/Dockerfile.j2 deleted file mode 100644 index e6c778f0b..000000000 --- a/docker/zun/zun-compute/Dockerfile.j2 +++ /dev/null @@ -1,37 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block zun_compute_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - -{{ macros.enable_extra_repos(['ceph', 'epel']) }} - -{% endif %} - -{% set zun_compute_packages = [ - 'ceph-common', - 'e2fsprogs', - 'pciutils', - 'xfsprogs', -] %} - -{{ macros.install_packages(zun_compute_packages | customizable("packages")) }} - -COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers -COPY extend_start.sh /usr/local/bin/kolla_zun_extend_start - -RUN chmod 644 /usr/local/bin/kolla_zun_extend_start \ - && chmod 750 /etc/sudoers.d \ - && chmod 640 /etc/sudoers.d/kolla_zun_sudoers - -{{ macros.kolla_patch_sources() }} - -{% block zun_compute_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER zun diff --git a/docker/zun/zun-compute/extend_start.sh b/docker/zun/zun-compute/extend_start.sh deleted file mode 100644 index f3b6fc48b..000000000 --- a/docker/zun/zun-compute/extend_start.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -gid=$(stat -c "%g" /var/run/docker.sock) -sudo groupadd --force --gid $gid docker -sudo usermod -aG docker zun diff --git a/docker/zun/zun-compute/zun_sudoers b/docker/zun/zun-compute/zun_sudoers deleted file mode 100644 index b3a39af7d..000000000 --- a/docker/zun/zun-compute/zun_sudoers +++ /dev/null @@ -1,3 +0,0 @@ -zun ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/zun-rootwrap /etc/zun/rootwrap.conf * -zun ALL=(root) NOPASSWD: /usr/sbin/groupadd --force --gid * -zun ALL=(root) NOPASSWD: /usr/sbin/usermod -aG docker zun diff --git a/docker/zun/zun-wsproxy/Dockerfile.j2 b/docker/zun/zun-wsproxy/Dockerfile.j2 deleted file mode 100644 index 09350ad40..000000000 --- a/docker/zun/zun-wsproxy/Dockerfile.j2 +++ /dev/null @@ -1,15 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block zun_wsproxy_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.kolla_patch_sources() }} - -{% block zun_wsproxy_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER zun |
