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
This commit is contained in:
Ghanshyam Mann 2020-11-28 09:54:51 -06:00 committed by Marcin Juszkiewicz
parent 865f55d4ec
commit d66ff8d3a3
12 changed files with 8 additions and 138 deletions

View File

@ -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/>`__

View File

@ -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

1 Image,CentOS,,Ubuntu,,Debian
63 prometheus,C,C,C,C,N,C
64 ptp (deprecated),C,C,C,C,N,C
65 qdrouterd,C,C,C,C,N,N
qinling,N,C,N,C,N,C
66 rabbitmq,C,C,C,C,N,C
67 radvd (deprecated),C,C,C,C,N,C
68 rally,C,C,N,C,N,C

View File

@ -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

1 Image,CentOS,,Ubuntu,,Debian
64 prometheus,C,C,C,C,C,C
65 ptp (deprecated),C,C,C,C,C,C
66 qdrouterd,C,C,N,N,N,N
qinling,N,C,N,C,N,C
67 rabbitmq,T,T,T,T,C,T
68 radvd (deprecated),C,C,C,C,C,C
69 rally,C,C,N,C,C,C

View File

@ -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

View File

@ -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 %}

View File

@ -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

View File

@ -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 %}

View File

@ -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

View File

@ -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

View File

@ -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,

View File

@ -107,7 +107,6 @@ UNBUILDABLE_IMAGES = {
"monasca-base",
"monasca-thresh",
"nova-mksproxy",
"qinling-base",
"searchlight-base",
"solum-base",
"vmtp",

View File

@ -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