diff options
| author | Ghanshyam Mann <gmann@ghanshyammann.com> | 2020-11-28 09:54:51 -0600 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-12-11 14:21:10 +0000 |
| commit | d66ff8d3a3eaf22c2106fd0cffd26a243a40aa9b (patch) | |
| tree | 18c80d80da3be79d3d37a8034486a6a3702c447b | |
| parent | 865f55d4ec408f1e0a5fd8ef4f77edc566c8eb75 (diff) | |
| download | kolla-d66ff8d3a3eaf22c2106fd0cffd26a243a40aa9b.tar.gz kolla-d66ff8d3a3eaf22c2106fd0cffd26a243a40aa9b.zip | |
Remove retired Qinling support and images
Qinling project is retiring in Wallaby cycle[1].
This commit removes the usages of Qinling project
before its code is removed.
Needed-By: https://review.opendev.org/c/openstack/qinling/+/764521
[1] http://lists.openstack.org/pipermail/openstack-discuss/2020-November/018638.html
Change-Id: I5bb79f08b76830981be95df19f3a33f5fda6893d
| -rw-r--r-- | README.rst | 1 | ||||
| -rw-r--r-- | doc/source/matrix_aarch64.csv | 1 | ||||
| -rw-r--r-- | doc/source/matrix_x86.csv | 1 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 | ||||
| -rw-r--r-- | docker/qinling/qinling-api/Dockerfile.j2 | 19 | ||||
| -rw-r--r-- | docker/qinling/qinling-api/extend_start.sh | 10 | ||||
| -rw-r--r-- | docker/qinling/qinling-base/Dockerfile.j2 | 55 | ||||
| -rw-r--r-- | docker/qinling/qinling-base/extend_start.sh | 10 | ||||
| -rw-r--r-- | docker/qinling/qinling-engine/Dockerfile.j2 | 18 | ||||
| -rwxr-xr-x | kolla/common/config.py | 13 | ||||
| -rwxr-xr-x | kolla/image/build.py | 1 | ||||
| -rw-r--r-- | releasenotes/notes/remove-qinling-images-8412ec1ca6adb531.yaml | 8 |
12 files changed, 8 insertions, 138 deletions
diff --git a/README.rst b/README.rst index 53a0ea9bc..b062615a2 100644 --- a/README.rst +++ b/README.rst @@ -98,7 +98,6 @@ Kolla provides images to deploy the following OpenStack projects: - `Nova <https://docs.openstack.org/nova/latest/>`__ - `Octavia <https://docs.openstack.org/octavia/latest/>`__ - `Panko <https://docs.openstack.org/panko/latest/>`__ -- `Qinling <https://docs.openstack.org/qinling/latest/>`__ - `Rally <https://docs.openstack.org/rally/latest/>`__ - `Sahara <https://docs.openstack.org/sahara/latest/>`__ - `Searchlight <https://docs.openstack.org/searchlight/latest/>`__ diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index 5d605eb3c..4a1931b1b 100644 --- a/doc/source/matrix_aarch64.csv +++ b/doc/source/matrix_aarch64.csv @@ -63,7 +63,6 @@ placement,C,C,N,C,N,C prometheus,C,C,C,C,N,C ptp (deprecated),C,C,C,C,N,C qdrouterd,C,C,C,C,N,N -qinling,N,C,N,C,N,C rabbitmq,C,C,C,C,N,C radvd (deprecated),C,C,C,C,N,C rally,C,C,N,C,N,C diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv index 2ee147ba6..161082b44 100644 --- a/doc/source/matrix_x86.csv +++ b/doc/source/matrix_x86.csv @@ -64,7 +64,6 @@ placement,T,T,T,T,C,T prometheus,C,C,C,C,C,C ptp (deprecated),C,C,C,C,C,C qdrouterd,C,C,N,N,N,N -qinling,N,C,N,C,N,C rabbitmq,T,T,T,T,C,T radvd (deprecated),C,C,C,C,C,C rally,C,C,N,C,C,C diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 8709ad1f6..fabd12dca 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -196,14 +196,6 @@ function config_octavia_dashboard { "${SITE_PACKAGES}/openstack_dashboard/local/enabled/_1482_project_load_balancer_panel.py" } -function config_qinling_dashboard { - for file in ${SITE_PACKAGES}/qinling_dashboard/enabled/_*[^__].py; do - config_dashboard "${ENABLE_QINLING}" \ - "${SITE_PACKAGES}/qinling_dashboard/enabled/${file##*/}" \ - "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" - done -} - function config_sahara_dashboard { for file in ${SITE_PACKAGES}/sahara_dashboard/enabled/_*[^__].py; do config_dashboard "${ENABLE_SAHARA}" \ @@ -342,7 +334,6 @@ config_monasca_ui config_murano_dashboard config_neutron_vpnaas_dashboard config_octavia_dashboard -config_qinling_dashboard config_sahara_dashboard config_searchlight_ui config_senlin_dashboard diff --git a/docker/qinling/qinling-api/Dockerfile.j2 b/docker/qinling/qinling-api/Dockerfile.j2 deleted file mode 100644 index 35ef35aa0..000000000 --- a/docker/qinling/qinling-api/Dockerfile.j2 +++ /dev/null @@ -1,19 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}qinling-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block qinling_api_header %}{% endblock %} - -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_qinling_extend_start -RUN chmod 755 /usr/local/bin/kolla_qinling_extend_start - -{% block qinling_api_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/qinling/qinling-api/extend_start.sh b/docker/qinling/qinling-api/extend_start.sh deleted file mode 100644 index 3a7964c72..000000000 --- a/docker/qinling/qinling-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 - qinling-db-manage upgrade head - exit 0 -fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/qinling/qinling-base/Dockerfile.j2 b/docker/qinling/qinling-base/Dockerfile.j2 deleted file mode 100644 index 800e9d5f2..000000000 --- a/docker/qinling/qinling-base/Dockerfile.j2 +++ /dev/null @@ -1,55 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block qinling_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='qinling') }} - -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% elif install_type == 'source' %} - - {% if base_package_type == 'rpm' %} - - {% set qinling_base_packages = [ - ] %} - - {% elif base_package_type == 'deb' %} - - {% set qinling_base_packages = [ - ] %} - - {% endif %} - -{{ macros.install_packages(qinling_base_packages | customizable("packages")) }} -RUN mkdir -p /var/www/cgi-bin/qinling - -ADD qinling-base-archive /qinling-base-source - -{% set qinling_base_pip_packages = [ - '/qinling' -] %} - -RUN ln -s qinling-base-source/* qinling \ - && {{ macros.install_pip(qinling_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/qinling /var/www/cgi-bin/qinling \ - && cp -r /qinling/etc/policy.json.sample /etc/qinling/policy.json \ - && cp /qinling/qinling/api/wsgi.py /var/www/cgi-bin/qinling \ - && chown -R qinling: /etc/qinling /var/www/cgi-bin/qinling - -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN touch /usr/local/bin/kolla_qinling_extend_start \ - && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_qinling_extend_start \ - && chmod 755 /var/www/cgi-bin/qinling - -{% block qinling_base_footer %}{% endblock %} diff --git a/docker/qinling/qinling-base/extend_start.sh b/docker/qinling/qinling-base/extend_start.sh deleted file mode 100644 index 3802bd878..000000000 --- a/docker/qinling/qinling-base/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/qinling" ]]; then - mkdir -p /var/log/kolla/qinling -fi -if [[ $(stat -c %a /var/log/kolla/qinling) != "755" ]]; then - chmod 755 /var/log/kolla/qinling -fi - -. /usr/local/bin/kolla_qinling_extend_start diff --git a/docker/qinling/qinling-engine/Dockerfile.j2 b/docker/qinling/qinling-engine/Dockerfile.j2 deleted file mode 100644 index 28031e339..000000000 --- a/docker/qinling/qinling-engine/Dockerfile.j2 +++ /dev/null @@ -1,18 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}qinling-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block qinling_engine_header %}{% endblock %} - -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% endif %} - -{% block qinling_engine_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER qinling diff --git a/kolla/common/config.py b/kolla/common/config.py index 4c7eda2f8..a2841fdd4 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -112,7 +112,6 @@ _PROFILE_OPTS = [ 'novajoin', 'octavia', 'panko', - 'qinling', 'rally', 'redis', 'sahara', @@ -419,10 +418,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/octavia-dashboard/' 'octavia-dashboard-${openstack_branch}.tar.gz')}, - 'horizon-plugin-qinling-dashboard': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/qinling-dashboard/' - 'qinling-dashboard-${openstack_branch}.tar.gz')}, 'horizon-plugin-sahara-dashboard': { 'type': 'url', 'location': ('$tarballs_base/openstack/sahara-dashboard/' @@ -624,10 +619,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/placement/' 'placement-${openstack_branch}.tar.gz')}, - 'qinling-base': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/qinling/' - 'qinling-${openstack_branch}.tar.gz')}, 'tempest-plugin-tempest-conf': { 'type': 'url', 'location': ('$tarballs_base/openstack/python-tempestconf/' @@ -1122,10 +1113,6 @@ USERS = { 'uid': 42483, 'gid': 42483, }, - 'qinling-user': { - 'uid': 42484, - 'gid': 42484, - }, 'masakari-user': { 'uid': 42485, 'gid': 42485, diff --git a/kolla/image/build.py b/kolla/image/build.py index 0c9f74fa1..8a4e48bf3 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -107,7 +107,6 @@ UNBUILDABLE_IMAGES = { "monasca-base", "monasca-thresh", "nova-mksproxy", - "qinling-base", "searchlight-base", "solum-base", "vmtp", diff --git a/releasenotes/notes/remove-qinling-images-8412ec1ca6adb531.yaml b/releasenotes/notes/remove-qinling-images-8412ec1ca6adb531.yaml new file mode 100644 index 000000000..21bff5ccd --- /dev/null +++ b/releasenotes/notes/remove-qinling-images-8412ec1ca6adb531.yaml @@ -0,0 +1,8 @@ +--- +upgrade: + - | + The ``Qinling`` project is no longer maintained and + `retired since Wallaby cycle`__ . Its image and support + is also removed since Wallaby cycle. + + __ http://lists.openstack.org/pipermail/openstack-discuss/2020-November/018638.html |
