From e332891a8af55cecfcdb1b96932029690b63037f Mon Sep 17 00:00:00 2001 From: gugug Date: Wed, 20 May 2020 09:01:30 +0800 Subject: Remove the congress images since it has been retired more info: https://review.opendev.org/#/c/721733/ Depends-On: I12d74b53b64268d0358220af35f7fd719d82b397 Depends-On: I21c9ab9820f78cf76adf11c5f0591c60f76372a8 Change-Id: I7bd03b4f70ddfb15c96ed68e659cb6dccb0c36a3 Co-Authored-By: jacky06 --- docker/congress/congress-api/Dockerfile.j2 | 14 ------- docker/congress/congress-api/extend_start.sh | 8 ---- docker/congress/congress-base/Dockerfile.j2 | 46 ---------------------- docker/congress/congress-base/extend_start.sh | 10 ----- docker/congress/congress-datasource/Dockerfile.j2 | 11 ------ .../congress/congress-policy-engine/Dockerfile.j2 | 11 ------ docker/horizon/extend_start.sh | 9 ----- docker/openstack-base/Dockerfile.j2 | 3 -- 8 files changed, 112 deletions(-) delete mode 100644 docker/congress/congress-api/Dockerfile.j2 delete mode 100644 docker/congress/congress-api/extend_start.sh delete mode 100644 docker/congress/congress-base/Dockerfile.j2 delete mode 100644 docker/congress/congress-base/extend_start.sh delete mode 100644 docker/congress/congress-datasource/Dockerfile.j2 delete mode 100644 docker/congress/congress-policy-engine/Dockerfile.j2 (limited to 'docker') diff --git a/docker/congress/congress-api/Dockerfile.j2 b/docker/congress/congress-api/Dockerfile.j2 deleted file mode 100644 index 9581cc602..000000000 --- a/docker/congress/congress-api/Dockerfile.j2 +++ /dev/null @@ -1,14 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block congress_api_header %}{% endblock %} - -COPY extend_start.sh /usr/local/bin/kolla_congress_extend_start -RUN chmod 755 /usr/local/bin/kolla_congress_extend_start - -{% block congress_api_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER congress diff --git a/docker/congress/congress-api/extend_start.sh b/docker/congress/congress-api/extend_start.sh deleted file mode 100644 index b18446d7f..000000000 --- a/docker/congress/congress-api/extend_start.sh +++ /dev/null @@ -1,8 +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 - congress-db-manage --config-file /etc/congress/congress.conf upgrade head - exit 0 -fi diff --git a/docker/congress/congress-base/Dockerfile.j2 b/docker/congress/congress-base/Dockerfile.j2 deleted file mode 100644 index ee1ca0f4c..000000000 --- a/docker/congress/congress-base/Dockerfile.j2 +++ /dev/null @@ -1,46 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix}}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block congress_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='congress') }} - -{% if install_type == 'binary' %} - {% if base_package_type == 'deb' %} - {% set congress_base_packages = [ - 'congress-common', - 'congress-server'] - %} - {% elif base_package_type == 'rpm' %} - {% set congress_base_packages = [ - 'openstack-congress'] - %} - {% endif %} - -{{ macros.install_packages(congress_base_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - -{% set congress_base_pip_packages = [ - '/congress' -] %} - -ADD congress-base-archive /congress-base-source -RUN ln -s congress-base-source/* congress \ - && {{ macros.install_pip(congress_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/congress \ - && cp -r /congress/etc/* /etc/congress/ \ - && chown -R congress: /etc/congress - -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN touch /usr/local/bin/kolla_congress_extend_start \ - && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_congress_extend_start - -{% block congress_base_footer %}{% endblock %} diff --git a/docker/congress/congress-base/extend_start.sh b/docker/congress/congress-base/extend_start.sh deleted file mode 100644 index 99e16e1bf..000000000 --- a/docker/congress/congress-base/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/congress" ]]; then - mkdir -p /var/log/kolla/congress -fi -if [[ $(stat -c %a /var/log/kolla/congress) != "755" ]]; then - chmod 755 /var/log/kolla/congress -fi - -. /usr/local/bin/kolla_congress_extend_start diff --git a/docker/congress/congress-datasource/Dockerfile.j2 b/docker/congress/congress-datasource/Dockerfile.j2 deleted file mode 100644 index 3cb903727..000000000 --- a/docker/congress/congress-datasource/Dockerfile.j2 +++ /dev/null @@ -1,11 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block congress_datasource_header %}{% endblock %} - -{% block congress_datasource_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER congress diff --git a/docker/congress/congress-policy-engine/Dockerfile.j2 b/docker/congress/congress-policy-engine/Dockerfile.j2 deleted file mode 100644 index 9e0fe5cf2..000000000 --- a/docker/congress/congress-policy-engine/Dockerfile.j2 +++ /dev/null @@ -1,11 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block congress_policy_engine_header %}{% endblock %} - -{% block congress_policy_engine_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER congress diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 3033fcd4f..94998cb36 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -80,14 +80,6 @@ function config_cloudkitty_dashboard { done } -function config_congress_dashboard { - for file in ${SITE_PACKAGES}/congress_dashboard/enabled/_*[^__].py; do - config_dashboard "${ENABLE_CONGRESS}" \ - "${SITE_PACKAGES}/congress_dashboard/enabled/${file##*/}" \ - "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" - done -} - function config_designate_dashboard { for file in ${SITE_PACKAGES}/designatedashboard/enabled/_*[^__].py; do config_dashboard "${ENABLE_DESIGNATE}" \ @@ -338,7 +330,6 @@ function settings_changed { config_blazar_dashboard config_cloudkitty_dashboard -config_congress_dashboard config_designate_dashboard config_fwaas_dashboard config_freezer_ui diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 4f9297077..f8be7b2d3 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -26,7 +26,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python3-barbicanclient', 'python3-cachetools', 'python3-cloudkittyclient', - 'python3-congressclient', 'python3-contextlib2', 'python3-cryptography', 'python3-designateclient', @@ -106,7 +105,6 @@ ENV DEBIAN_FRONTEND noninteractive 'patch', 'python3-aodhclient', 'python3-barbicanclient', - 'python3-congressclient', 'python3-designateclient', 'python3-elasticsearch', 'python3-etcd', @@ -269,7 +267,6 @@ ENV DEBIAN_FRONTEND noninteractive 'python-barbicanclient', 'python-cinderclient', 'python-cloudkittyclient', - 'python-congressclient', 'python-dateutil', 'python-designateclient', 'python-editor', -- cgit v1.2.3