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 /docker/qinling | |
| 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
Diffstat (limited to 'docker/qinling')
| -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 |
5 files changed, 0 insertions, 112 deletions
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 |
