From 0028073ebbe5335847ebaa720122962e494a478a Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Thu, 14 Jan 2021 09:28:37 +0100 Subject: [PATCH] Remove zaqar image and related plugins Signed-off-by: Christian Berendt Change-Id: Id3187b2b95e9b9bd3d9233a498f7c45e66c604c7 --- README.rst | 1 - doc/source/matrix_aarch64.csv | 1 - doc/source/matrix_x86.csv | 1 - docker/horizon/Dockerfile.j2 | 1 - docker/horizon/extend_start.sh | 9 --- docker/zaqar/zaqar-base/Dockerfile.j2 | 72 ------------------- docker/zaqar/zaqar-base/extend_start.sh | 15 ---- docker/zaqar/zaqar-server/Dockerfile.j2 | 20 ------ docker/zaqar/zaqar-wsgi/Dockerfile.j2 | 14 ---- docker/zaqar/zaqar-wsgi/extend_start.sh | 3 - kolla/common/config.py | 17 ----- kolla/image/build.py | 1 - .../remove-zaqar-image-de36960a88f132c8.yaml | 3 + roles/kolla-build-config/defaults/main.yml | 3 - tools/version-check.py | 1 - 15 files changed, 3 insertions(+), 159 deletions(-) delete mode 100644 docker/zaqar/zaqar-base/Dockerfile.j2 delete mode 100644 docker/zaqar/zaqar-base/extend_start.sh delete mode 100644 docker/zaqar/zaqar-server/Dockerfile.j2 delete mode 100644 docker/zaqar/zaqar-wsgi/Dockerfile.j2 delete mode 100755 docker/zaqar/zaqar-wsgi/extend_start.sh create mode 100644 releasenotes/notes/remove-zaqar-image-de36960a88f132c8.yaml diff --git a/README.rst b/README.rst index 126739e477..1b394b023b 100644 --- a/README.rst +++ b/README.rst @@ -108,7 +108,6 @@ Kolla provides images to deploy the following OpenStack projects: - `Vitrage `__ - `Vmtp `__ - `Watcher `__ -- `Zaqar `__ - `Zun `__ Infrastructure components diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index afb59a42f3..00f5b90560 100644 --- a/doc/source/matrix_aarch64.csv +++ b/doc/source/matrix_aarch64.csv @@ -74,6 +74,5 @@ trove,C,C,N,C,N,C vitrage,C,C,N,C,N,C vmtp,N,C,N,C,N,C watcher,C,C,C,C,N,C -zaqar (deprecated),C,C,C,C,N,C zookeeper,C,C,C,C,N,C zun,N,C,N,C,N,C diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv index 1ccad325e8..82b402c12f 100644 --- a/doc/source/matrix_x86.csv +++ b/doc/source/matrix_x86.csv @@ -75,6 +75,5 @@ trove,C,C,C,C,N,C vitrage,C,C,N,C,C,C vmtp,N,C,N,C,N,C watcher,C,C,C,C,C,C -zaqar (deprecated),C,C,N,C,C,C zookeeper,C,C,C,C,C,C zun,N,T,N,T,N,C diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 9065e5b682..e7f6b8d61e 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -69,7 +69,6 @@ RUN ln -s /usr/share/openstack-dashboard/openstack_dashboard /usr/lib/python{{ d 'python3-neutron-vpnaas-dashboard', 'python3-senlin-dashboard', 'python3-vitrage-dashboard', - 'python3-zaqar-ui', ] %} {% endif %} diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 7eff24f4e2..123e389f76 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -252,14 +252,6 @@ function config_watcher_dashboard { "/etc/openstack-dashboard/watcher_policy.json" } -function config_zaqar_dashboard { - for file in ${SITE_PACKAGES}/zaqar_ui/enabled/_*[^__].py; do - config_dashboard "${ENABLE_ZAQAR:-no}" \ - "${SITE_PACKAGES}/zaqar_ui/enabled/${file##*/}" \ - "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" - done -} - function config_zun_dashboard { for file in ${SITE_PACKAGES}/zun_ui/enabled/_*[^__].py; do config_dashboard "${ENABLE_ZUN:-no}" \ @@ -311,7 +303,6 @@ config_tacker_dashboard config_trove_dashboard config_vitrage_dashboard config_watcher_dashboard -config_zaqar_dashboard config_zun_dashboard if settings_changed; then diff --git a/docker/zaqar/zaqar-base/Dockerfile.j2 b/docker/zaqar/zaqar-base/Dockerfile.j2 deleted file mode 100644 index 6ee37065a9..0000000000 --- a/docker/zaqar/zaqar-base/Dockerfile.j2 +++ /dev/null @@ -1,72 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block zaqar_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='zaqar') }} - -{% if install_type == 'binary' %} - - {% if base_package_type == 'rpm' %} - {% set zaqar_base_packages = [ - 'openstack-zaqar', - ] %} - -{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }} \ - && mkdir -p /var/www/cgi-bin/zaqar \ - && chown -R zaqar: /var/www/cgi-bin/zaqar \ - && cp -a /usr/lib/python{{ distro_python_version }}/site-packages/zaqar/transport/wsgi/app.py /var/www/cgi-bin/zaqar/ - - {% elif base_package_type == 'deb' %} - {% set zaqar_base_packages = [ - 'zaqar-common', - ] %} - -{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }} \ - && mkdir -p /var/www/cgi-bin/zaqar \ - && chown -R zaqar: /var/www/cgi-bin/zaqar \ - && cp -a /usr/lib/python3/dist-packages/zaqar/transport/wsgi/app.py /var/www/cgi-bin/zaqar/ - {% endif %} - -{% elif install_type == 'source' %} - - {% if base_package_type == 'rpm' %} - {% set zaqar_base_packages = [ - ] %} - -{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }} - - {% elif base_package_type == 'deb' %} - {% set zaqar_base_packages = [ - ] %} - -{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }} - {% endif %} - -{% set zaqar_base_pip_packages = [ - 'pymongo', - '/zaqar', - 'gevent' -] %} - -ADD zaqar-base-archive /zaqar-base-source - -RUN ln -s zaqar-base-source/* zaqar \ - && {{ macros.install_pip(zaqar_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/zaqar /var/lib/zaqar /var/www/cgi-bin/zaqar \ - && cp -r /zaqar/etc/* /etc/zaqar/ \ - && cp /zaqar/zaqar/transport/wsgi/app.py /var/www/cgi-bin/zaqar \ - && chown -R zaqar: /etc/zaqar /var/lib/zaqar /var/www/cgi-bin/zaqar - -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN touch /usr/local/bin/kolla_zaqar_extend_start \ - && chmod 755 /var/www/cgi-bin/zaqar \ - && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_zaqar_extend_start - -{% block zaqar_base_footer %}{% endblock %} diff --git a/docker/zaqar/zaqar-base/extend_start.sh b/docker/zaqar/zaqar-base/extend_start.sh deleted file mode 100644 index f696c024d2..0000000000 --- a/docker/zaqar/zaqar-base/extend_start.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# Create log dir for Zaqar logs -LOG_DIR="/var/log/kolla/zaqar" -if [[ ! -d "${LOG_DIR}" ]]; then - mkdir -p ${LOG_DIR} -fi -if [[ $(stat -c %U:%G ${LOG_DIR}) != "zaqar:kolla" ]]; then - chown zaqar:kolla ${LOG_DIR} -fi -if [[ $(stat -c %a ${LOG_DIR}) != "755" ]]; then - chmod 755 ${LOG_DIR} -fi - -. /usr/local/bin/kolla_zaqar_extend_start diff --git a/docker/zaqar/zaqar-server/Dockerfile.j2 b/docker/zaqar/zaqar-server/Dockerfile.j2 deleted file mode 100644 index 6b607a1ecb..0000000000 --- a/docker/zaqar/zaqar-server/Dockerfile.j2 +++ /dev/null @@ -1,20 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}zaqar-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block zaqar_server_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if install_type == 'binary' %} - {% if base_package_type == 'deb' %} - {% set zaqar_server_packages = ['zaqar-server'] %} - -{{ macros.install_packages(zaqar_server_packages | customizable("packages")) }} - - {% endif %} -{% endif %} - -{% block zaqar_server_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/zaqar/zaqar-wsgi/Dockerfile.j2 b/docker/zaqar/zaqar-wsgi/Dockerfile.j2 deleted file mode 100644 index c9640617f1..0000000000 --- a/docker/zaqar/zaqar-wsgi/Dockerfile.j2 +++ /dev/null @@ -1,14 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}zaqar-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block zaqar_wsgi_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -COPY extend_start.sh /usr/local/bin/kolla_zaqar_extend_start -RUN chmod 755 /usr/local/bin/kolla_zaqar_extend_start - -{% block zaqar_wsgi_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/zaqar/zaqar-wsgi/extend_start.sh b/docker/zaqar/zaqar-wsgi/extend_start.sh deleted file mode 100755 index c55f0b1995..0000000000 --- a/docker/zaqar/zaqar-wsgi/extend_start.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -. /usr/local/bin/kolla_httpd_setup diff --git a/kolla/common/config.py b/kolla/common/config.py index c3e8f98011..b21d9ce701 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -115,7 +115,6 @@ _PROFILE_OPTS = [ 'telegraf', 'trove', 'vitrage', - 'zaqar', 'zookeeper', 'zun', ], @@ -431,10 +430,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/watcher-dashboard/' 'watcher-dashboard-${openstack_branch}.tar.gz')}, - 'horizon-plugin-zaqar-ui': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/zaqar-ui/' - 'zaqar-ui-${openstack_branch}.tar.gz')}, 'horizon-plugin-zun-ui': { 'type': 'url', 'location': ('$tarballs_base/openstack/zun-ui/' @@ -664,10 +659,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/watcher-tempest-plugin/' 'watcher-tempest-plugin-master.tar.gz')}, - 'tempest-plugin-zaqar': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/zaqar-tempest-plugin/' - 'zaqar-tempest-plugin-master.tar.gz')}, 'rally': { 'type': 'url', 'location': ('$tarballs_base/openstack/rally/' @@ -744,10 +735,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/watcher/' 'watcher-${openstack_branch}.tar.gz')}, - 'zaqar-base': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/zaqar/' - 'zaqar-${openstack_branch}.tar.gz')}, 'zun-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/zun/' @@ -954,10 +941,6 @@ USERS = { 'uid': 42451, 'gid': 42451, }, - 'zaqar-user': { - 'uid': 42452, - 'gid': 42452, - }, 'zookeeper-user': { 'uid': 42453, 'gid': 42453, diff --git a/kolla/image/build.py b/kolla/image/build.py index 62db92ebf7..e495bb90d3 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -177,7 +177,6 @@ UNBUILDABLE_IMAGES = { "senlin-health-manager", # no binary package "tacker-base", "vitrage-base", - "zaqar", "neutron-mlnx-agent", }, } diff --git a/releasenotes/notes/remove-zaqar-image-de36960a88f132c8.yaml b/releasenotes/notes/remove-zaqar-image-de36960a88f132c8.yaml new file mode 100644 index 0000000000..1d0a21076e --- /dev/null +++ b/releasenotes/notes/remove-zaqar-image-de36960a88f132c8.yaml @@ -0,0 +1,3 @@ +--- +upgrade: + - The ``zaqar`` image and related plugins are removed per the deprecation cycle. diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml index 131532129d..1cbde01dc5 100644 --- a/roles/kolla-build-config/defaults/main.yml +++ b/roles/kolla-build-config/defaults/main.yml @@ -75,7 +75,6 @@ kolla_build_sources: openstack/vitrage: vitrage-base openstack/vmtp: vmtp openstack/watcher: watcher-base - openstack/zaqar: zaqar openstack/zun: zun-base # Horizon and its plugins @@ -100,7 +99,6 @@ kolla_build_sources: openstack/trove-dashboard: horizon-plugin-trove-dashboard openstack/vitrage-dashboard: horizon-plugin-vitrage-dashboard openstack/watcher-dashboard: horizon-plugin-watcher-dashboard - openstack/zaqar-ui: horizon-plugin-zaqar-ui openstack/zun-ui: horizon-plugin-zun-ui # Tempest and its plugins @@ -124,4 +122,3 @@ kolla_build_sources: openstack/trove-tempest-plugin: tempest-plugin-trove openstack/vitrage-tempest-plugin: tempest-plugin-vitrage openstack/watcher-tempest-plugin: tempest-plugin-watcher - openstack/zaqar-tempest-plugin: tempest-plugin-zaqar diff --git a/tools/version-check.py b/tools/version-check.py index 7f9a4f889e..2777c0af0d 100755 --- a/tools/version-check.py +++ b/tools/version-check.py @@ -72,7 +72,6 @@ ALWAYS_USE_VERSION_PROJECTS = { 'trove_tempest_plugin', 'vitrage-tempest-plugin', 'watcher-tempest-plugin', - 'zaqar_tempest_plugin', 'tempest', 'vmtp', }