From d4a68553b2337e2f820ff4657faaed433c2b310f Mon Sep 17 00:00:00 2001 From: Kendall Nelson Date: Thu, 17 Dec 2020 13:21:50 -0800 Subject: Remove Retired Karbor Support As announced on the openstack-discuss ML[1], Karbor is retiring this cycle (Wallaby). Needed-By: https://review.opendev.org/c/openstack/karbor/+/767032 [1] http://lists.openstack.org/pipermail/openstack-discuss/2020-November/018643.html Change-Id: I0b8b1782874282636552f3ffe924a8d512d48959 --- docker/horizon/extend_start.sh | 9 ----- docker/karbor/karbor-api/Dockerfile.j2 | 21 ------------ docker/karbor/karbor-api/extend_start.sh | 8 ----- docker/karbor/karbor-base/Dockerfile.j2 | 38 ---------------------- docker/karbor/karbor-base/extend_start.sh | 10 ------ docker/karbor/karbor-operationengine/Dockerfile.j2 | 18 ---------- docker/karbor/karbor-protection/Dockerfile.j2 | 18 ---------- 7 files changed, 122 deletions(-) delete mode 100644 docker/karbor/karbor-api/Dockerfile.j2 delete mode 100644 docker/karbor/karbor-api/extend_start.sh delete mode 100644 docker/karbor/karbor-base/Dockerfile.j2 delete mode 100644 docker/karbor/karbor-base/extend_start.sh delete mode 100644 docker/karbor/karbor-operationengine/Dockerfile.j2 delete mode 100644 docker/karbor/karbor-protection/Dockerfile.j2 (limited to 'docker') diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index a56f155ef..398ff52c5 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -116,14 +116,6 @@ function config_ironic_dashboard { done } -function config_karbor_dashboard { - for file in ${SITE_PACKAGES}/karbor_dashboard/enabled/_*[^__].py; do - config_dashboard "${ENABLE_KARBOR}" \ - "${SITE_PACKAGES}/karbor_dashboard/enabled/${file##*/}" \ - "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" - done -} - function config_magnum_dashboard { for file in ${SITE_PACKAGES}/magnum_ui/enabled/_*[^__].py; do config_dashboard "${ENABLE_MAGNUM}" \ @@ -309,7 +301,6 @@ config_designate_dashboard config_freezer_ui config_heat_dashboard config_ironic_dashboard -config_karbor_dashboard config_magnum_dashboard config_manila_ui config_masakari_dashboard diff --git a/docker/karbor/karbor-api/Dockerfile.j2 b/docker/karbor/karbor-api/Dockerfile.j2 deleted file mode 100644 index 32b084f88..000000000 --- a/docker/karbor/karbor-api/Dockerfile.j2 +++ /dev/null @@ -1,21 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block karbor_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_karbor_extend_start -RUN chmod 755 /usr/local/bin/kolla_karbor_extend_start - -{% block karbor_api_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER karbor diff --git a/docker/karbor/karbor-api/extend_start.sh b/docker/karbor/karbor-api/extend_start.sh deleted file mode 100644 index c5102072e..000000000 --- a/docker/karbor/karbor-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 - karbor-manage db sync - exit 0 -fi diff --git a/docker/karbor/karbor-base/Dockerfile.j2 b/docker/karbor/karbor-base/Dockerfile.j2 deleted file mode 100644 index bb8c3eff3..000000000 --- a/docker/karbor/karbor-base/Dockerfile.j2 +++ /dev/null @@ -1,38 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block karbor_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='karbor') }} - -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% elif install_type == 'source' %} - -ADD karbor-base-archive /karbor-base-source - -{% set karbor_base_pip_packages = [ - '/karbor' -] %} - -RUN ln -s karbor-base-source/* karbor \ - && {{ macros.install_pip(karbor_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/karbor \ - && cp -r /karbor/etc/* /etc/karbor/ \ - && chown -R karbor: /etc/karbor - -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN touch /usr/local/bin/kolla_karbor_extend_start \ - && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_karbor_extend_start - -{% block karbor_base_footer %}{% endblock %} diff --git a/docker/karbor/karbor-base/extend_start.sh b/docker/karbor/karbor-base/extend_start.sh deleted file mode 100644 index db0fdacc8..000000000 --- a/docker/karbor/karbor-base/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/karbor" ]]; then - mkdir -p /var/log/kolla/karbor -fi -if [[ $(stat -c %a /var/log/kolla/karbor) != "755" ]]; then - chmod 755 /var/log/kolla/karbor -fi - -. /usr/local/bin/kolla_karbor_extend_start diff --git a/docker/karbor/karbor-operationengine/Dockerfile.j2 b/docker/karbor/karbor-operationengine/Dockerfile.j2 deleted file mode 100644 index dbb95f57b..000000000 --- a/docker/karbor/karbor-operationengine/Dockerfile.j2 +++ /dev/null @@ -1,18 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block karbor_operationengine_header %}{% endblock %} - -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% endif %} - -{% block karbor_operationengine_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER karbor diff --git a/docker/karbor/karbor-protection/Dockerfile.j2 b/docker/karbor/karbor-protection/Dockerfile.j2 deleted file mode 100644 index 827b77abf..000000000 --- a/docker/karbor/karbor-protection/Dockerfile.j2 +++ /dev/null @@ -1,18 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}karbor-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block karbor_protection_header %}{% endblock %} - -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% endif %} - -{% block karbor_protection_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER karbor -- cgit v1.2.3