diff options
25 files changed, 9 insertions, 327 deletions
diff --git a/README.rst b/README.rst index 766d6b928..3170ec726 100644 --- a/README.rst +++ b/README.rst @@ -82,7 +82,6 @@ Kolla provides images to deploy the following OpenStack projects: - `Horizon <https://docs.openstack.org/horizon/latest/>`__ - `Ironic <https://docs.openstack.org/ironic/latest/>`__ - `Keystone <https://docs.openstack.org/keystone/latest/>`__ -- `Kuryr <https://docs.openstack.org/kuryr/latest/>`__ - `Magnum <https://docs.openstack.org/magnum/latest/>`__ - `Manila <https://docs.openstack.org/manila/latest/>`__ - `Masakari <https://docs.openstack.org/masakari/latest/>`__ @@ -95,7 +94,6 @@ Kolla provides images to deploy the following OpenStack projects: - `Tacker <https://docs.openstack.org/tacker/latest/>`__ - `Trove <https://docs.openstack.org/trove/latest/>`__ - `Watcher <https://docs.openstack.org/watcher/latest/>`__ -- `Zun <https://docs.openstack.org/zun/latest/>`__ Infrastructure components ------------------------- diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index 7dbd5849f..272d168a1 100644 --- a/doc/source/matrix_aarch64.csv +++ b/doc/source/matrix_aarch64.csv @@ -25,7 +25,6 @@ iscsid,U,U,U keepalived,U,U,U keystone,U,U,U kolla-toolbox,U,U,U -kuryr,U,U,U magnum,U,U,U manila,U,U,U mariadb,U,U,U @@ -51,4 +50,3 @@ tgtd,U,U,U trove,U,U,U valkey,U,U,U watcher,U,U,U -zun,U,U,U diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv index 512577aac..00216592b 100644 --- a/doc/source/matrix_x86.csv +++ b/doc/source/matrix_x86.csv @@ -26,7 +26,6 @@ iscsid,T,T,U keepalived,T,T,U keystone,T,T,T kolla-toolbox,T,T,T -kuryr,T,T,U magnum,U,U,U manila,U,U,U mariadb,T,T,T @@ -53,4 +52,3 @@ tgtd,N,T,U trove,U,U,U valkey,T,U,U watcher,U,U,U -zun,T,T,U 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 diff --git a/kolla/common/config.py b/kolla/common/config.py index d66221af1..7657ed485 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -88,7 +88,6 @@ _PROFILE_OPTS = [ 'designate', 'gnocchi', 'ironic', - 'kuryr', 'magnum', 'manila', 'masakari', @@ -97,7 +96,6 @@ _PROFILE_OPTS = [ 'tacker', 'trove', 'valkey', - 'zun', ], help='Aux Images'), cfg.ListOpt('default', diff --git a/kolla/common/sources.py b/kolla/common/sources.py index 9e2e53874..c2958b265 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -139,10 +139,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/watcher-dashboard/' 'watcher-dashboard-${openstack_branch}.tar.gz')}, - 'horizon-plugin-zun-ui': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/zun-ui/' - 'zun-ui-${openstack_branch}.tar.gz')}, 'ironic-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/ironic/' @@ -160,14 +156,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/requirements/' 'requirements-${openstack_branch}.tar.gz')}, - 'kuryr-base': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/kuryr/' - 'kuryr-${openstack_branch}.tar.gz')}, - 'kuryr-libnetwork': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/kuryr-libnetwork/' - 'kuryr-libnetwork-${openstack_branch}.tar.gz')}, 'letsencrypt-lego': { 'version': 'v4.27.0', 'type': 'url', @@ -435,9 +423,5 @@ SOURCES = { 'watcher-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/watcher/' - 'watcher-${openstack_branch}.tar.gz')}, - 'zun-base': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/zun/' - 'zun-${openstack_branch}.tar.gz')} + 'watcher-${openstack_branch}.tar.gz')} } diff --git a/kolla/common/users.py b/kolla/common/users.py index 623456071..cd0a66660 100644 --- a/kolla/common/users.py +++ b/kolla/common/users.py @@ -229,7 +229,7 @@ USERS = { 'uid': 42462, 'gid': 42462, }, - 'zun-user': { + 'zun-user': { # unused user (zun dropped) 'uid': 42463, 'gid': 42463, }, @@ -253,7 +253,7 @@ USERS = { 'uid': 42468, 'gid': 42468, }, - 'kuryr-user': { + 'kuryr-user': { # unused user (kuryr dropped) 'uid': 42469, 'gid': 42469, }, diff --git a/releasenotes/notes/drop-kuryr-and-zun-e48eb3d9d6a61758.yaml b/releasenotes/notes/drop-kuryr-and-zun-e48eb3d9d6a61758.yaml new file mode 100644 index 000000000..e3de80a66 --- /dev/null +++ b/releasenotes/notes/drop-kuryr-and-zun-e48eb3d9d6a61758.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Support for building ``zun`` images has been dropped, due to the project + being released broken. ``kuryr`` container images support has also been + dropped because only ``zun`` was using them. diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml index 81313edaf..0306bb0cf 100644 --- a/roles/kolla-build-config/defaults/main.yml +++ b/roles/kolla-build-config/defaults/main.yml @@ -27,8 +27,6 @@ kolla_build_sources: openstack/heat: heat-base openstack/ironic: ironic-base openstack/keystone: keystone-base - openstack/kuryr: kuryr-base - openstack/kuryr-libnetwork: kuryr-libnetwork openstack/magnum: magnum-base openstack/manila: manila-base openstack/mistral: mistral-base @@ -59,7 +57,6 @@ kolla_build_sources: - mistral-base-plugin-tacker openstack/trove: trove-base openstack/watcher: watcher-base - openstack/zun: zun-base # Horizon and its plugins openstack/horizon: horizon @@ -77,4 +74,3 @@ kolla_build_sources: openstack/tacker-horizon: horizon-plugin-tacker-dashboard openstack/trove-dashboard: horizon-plugin-trove-dashboard openstack/watcher-dashboard: horizon-plugin-watcher-dashboard - openstack/zun-ui: horizon-plugin-zun-ui diff --git a/tools/version-check.py b/tools/version-check.py index 245503302..2220b4a52 100755 --- a/tools/version-check.py +++ b/tools/version-check.py @@ -52,7 +52,6 @@ ALWAYS_USE_VERSION_PROJECTS = { # NOTE(hrw): those projects have different names for release tarballs (first # column) and other for branch tarballs RENAME_PROJECTS = { - 'kuryr-lib': 'kuryr', 'openstack-cyborg': 'cyborg', 'openstack-heat': 'heat', 'openstack-placement': 'placement', |