From 14a2e37f00a8197de97f88eebe88b2ff385b4ccb Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 15 Apr 2024 14:55:39 +0200 Subject: Drop Senlin It's inactive and hasn't produced a 2024.1 release [1]. [1]: https://governance.openstack.org/tc/reference/emerging-technology-and-inactive-projects.html#current-inactive-projects Change-Id: Iad4d850ba8f8b8446591cab883d2ad6243576926 --- docker/horizon/extend_start.sh | 13 ----------- docker/senlin/senlin-api/Dockerfile.j2 | 16 -------------- docker/senlin/senlin-api/extend_start.sh | 8 ------- docker/senlin/senlin-base/Dockerfile.j2 | 27 ----------------------- docker/senlin/senlin-base/extend_start.sh | 10 --------- docker/senlin/senlin-conductor/Dockerfile.j2 | 13 ----------- docker/senlin/senlin-engine/Dockerfile.j2 | 13 ----------- docker/senlin/senlin-health-manager/Dockerfile.j2 | 11 --------- 8 files changed, 111 deletions(-) delete mode 100644 docker/senlin/senlin-api/Dockerfile.j2 delete mode 100644 docker/senlin/senlin-api/extend_start.sh delete mode 100644 docker/senlin/senlin-base/Dockerfile.j2 delete mode 100644 docker/senlin/senlin-base/extend_start.sh delete mode 100644 docker/senlin/senlin-conductor/Dockerfile.j2 delete mode 100644 docker/senlin/senlin-engine/Dockerfile.j2 delete mode 100644 docker/senlin/senlin-health-manager/Dockerfile.j2 (limited to 'docker') diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 965aef245..8115556e8 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -163,18 +163,6 @@ function config_sahara_dashboard { done } -function config_senlin_dashboard { - for file in ${SITE_PACKAGES}/senlin_dashboard/enabled/_*[^__].py; do - config_dashboard "${ENABLE_SENLIN:-no}" \ - "${SITE_PACKAGES}/senlin_dashboard/enabled/${file##*/}" \ - "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" - done - - config_dashboard "${ENABLE_SENLIN:-no}" \ - "${SITE_PACKAGES}/senlin_dashboard/conf/senlin_policy.json" \ - "/etc/openstack-dashboard/senlin_policy.json" -} - function config_solum_dashboard { for file in ${SITE_PACKAGES}/solumdashboard/local/enabled/_*[^__].py; do config_dashboard "${ENABLE_SOLUM:-no}" \ @@ -270,7 +258,6 @@ config_mistral_dashboard config_neutron_vpnaas_dashboard config_octavia_dashboard config_sahara_dashboard -config_senlin_dashboard config_solum_dashboard config_tacker_dashboard config_trove_dashboard diff --git a/docker/senlin/senlin-api/Dockerfile.j2 b/docker/senlin/senlin-api/Dockerfile.j2 deleted file mode 100644 index d93f05994..000000000 --- a/docker/senlin/senlin-api/Dockerfile.j2 +++ /dev/null @@ -1,16 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block senlin_api_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -COPY extend_start.sh /usr/local/bin/kolla_senlin_extend_start -RUN chmod 644 /usr/local/bin/kolla_senlin_extend_start - -{% block senlin_api_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER senlin diff --git a/docker/senlin/senlin-api/extend_start.sh b/docker/senlin/senlin-api/extend_start.sh deleted file mode 100644 index 2de5b4c65..000000000 --- a/docker/senlin/senlin-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 - senlin-manage --config-file /etc/senlin/senlin.conf db_sync - exit 0 -fi diff --git a/docker/senlin/senlin-base/Dockerfile.j2 b/docker/senlin/senlin-base/Dockerfile.j2 deleted file mode 100644 index 271e19287..000000000 --- a/docker/senlin/senlin-base/Dockerfile.j2 +++ /dev/null @@ -1,27 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block senlin_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='senlin') }} - -ADD senlin-base-archive /senlin-base-source - -{% set senlin_base_pip_packages = [ - '/senlin' -] %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN ln -s senlin-base-source/* senlin \ - && {{ macros.install_pip(senlin_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/senlin \ - && cp -r /senlin/etc/senlin/* /etc/senlin \ - && touch /usr/local/bin/kolla_senlin_extend_start \ - && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_senlin_extend_start - -{% block senlin_base_footer %}{% endblock %} diff --git a/docker/senlin/senlin-base/extend_start.sh b/docker/senlin/senlin-base/extend_start.sh deleted file mode 100644 index 0a9c7bca1..000000000 --- a/docker/senlin/senlin-base/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/senlin" ]]; then - mkdir -p /var/log/kolla/senlin -fi -if [[ $(stat -c %a /var/log/kolla/senlin) != "755" ]]; then - chmod 755 /var/log/kolla/senlin -fi - -. /usr/local/bin/kolla_senlin_extend_start diff --git a/docker/senlin/senlin-conductor/Dockerfile.j2 b/docker/senlin/senlin-conductor/Dockerfile.j2 deleted file mode 100644 index a4dd6bc5f..000000000 --- a/docker/senlin/senlin-conductor/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block senlin_conductor_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% block senlin_conductor_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER senlin diff --git a/docker/senlin/senlin-engine/Dockerfile.j2 b/docker/senlin/senlin-engine/Dockerfile.j2 deleted file mode 100644 index f3a9eac25..000000000 --- a/docker/senlin/senlin-engine/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block senlin_engine_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% block senlin_engine_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER senlin diff --git a/docker/senlin/senlin-health-manager/Dockerfile.j2 b/docker/senlin/senlin-health-manager/Dockerfile.j2 deleted file mode 100644 index 8a37b2beb..000000000 --- a/docker/senlin/senlin-health-manager/Dockerfile.j2 +++ /dev/null @@ -1,11 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block senlin_health_manager_header %}{% endblock %} - -{% block senlin_health_manager_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER senlin -- cgit v1.2.3