From 14a2e37f00a8197de97f88eebe88b2ff385b4ccb Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 15 Apr 2024 14:55:39 +0200 Subject: [PATCH] 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 --- README.rst | 1 - doc/source/matrix_aarch64.csv | 1 - doc/source/matrix_x86.csv | 1 - 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 --------- .../senlin-health-manager/Dockerfile.j2 | 11 -------- kolla/common/config.py | 1 - kolla/common/sources.py | 8 ------ kolla/common/users.py | 2 +- .../notes/drop-senlin-aadc2bd1eb50d046.yaml | 4 +++ roles/kolla-build-config/defaults/main.yml | 2 -- 16 files changed, 5 insertions(+), 126 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 create mode 100644 releasenotes/notes/drop-senlin-aadc2bd1eb50d046.yaml diff --git a/README.rst b/README.rst index 66b1779ff1..947bce6e17 100644 --- a/README.rst +++ b/README.rst @@ -93,7 +93,6 @@ Kolla provides images to deploy the following OpenStack projects: - `Nova `__ - `Octavia `__ - `Sahara `__ (deprecated) -- `Senlin `__ - Skyline (`APIServer `__ and `Console `__) - `Solum `__ - `Swift `__ diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index cb11ee4892..bf52a09104 100644 --- a/doc/source/matrix_aarch64.csv +++ b/doc/source/matrix_aarch64.csv @@ -49,7 +49,6 @@ prometheus,U,U,U rabbitmq,U,U,U redis,U,U,U sahara,U,U,U -senlin,U,U,U skyline,U,U,U solum,U,U,U swift,U,U,U diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv index 3842212239..a0aea2dda4 100644 --- a/doc/source/matrix_x86.csv +++ b/doc/source/matrix_x86.csv @@ -50,7 +50,6 @@ prometheus,U,U,U rabbitmq,T,T,T redis,T,U,U sahara,U,U,U -senlin,U,U,U skyline,U,U,U solum,U,U,U swift,T,T,U diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 965aef245a..8115556e81 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 d93f059940..0000000000 --- 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 2de5b4c650..0000000000 --- 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 271e19287b..0000000000 --- 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 0a9c7bca13..0000000000 --- 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 a4dd6bc5f5..0000000000 --- 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 f3a9eac259..0000000000 --- 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 8a37b2beb0..0000000000 --- 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 diff --git a/kolla/common/config.py b/kolla/common/config.py index ab13f1154c..21979997bd 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -103,7 +103,6 @@ _PROFILE_OPTS = [ 'octavia', 'redis', 'sahara', - 'senlin', 'solum', 'tacker', 'telegraf', diff --git a/kolla/common/sources.py b/kolla/common/sources.py index fa1ddda7d2..ab2a9d40b5 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -143,10 +143,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/sahara-dashboard/' 'sahara-dashboard-${openstack_branch}.tar.gz')}, - 'horizon-plugin-senlin-dashboard': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/senlin-dashboard/' - 'senlin-dashboard-${openstack_branch}.tar.gz')}, 'horizon-plugin-solum-dashboard': { 'type': 'url', 'location': ('$tarballs_base/openstack/solum-dashboard/' @@ -448,10 +444,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/sahara-plugin-vanilla/' 'sahara-plugin-vanilla-${openstack_branch}.tar.gz')}, - 'senlin-base': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/senlin/' - 'senlin-${openstack_branch}.tar.gz')}, 'skyline-apiserver': { 'type': 'url', 'location': ('$tarballs_base/openstack/skyline-apiserver/' diff --git a/kolla/common/users.py b/kolla/common/users.py index 8f6c2144d0..5b0e2da74e 100644 --- a/kolla/common/users.py +++ b/kolla/common/users.py @@ -165,7 +165,7 @@ USERS = { 'uid': 42441, 'gid': 42441, }, - 'senlin-user': { + 'senlin-user': { # unused user (senlin dropped) 'uid': 42443, 'gid': 42443, }, diff --git a/releasenotes/notes/drop-senlin-aadc2bd1eb50d046.yaml b/releasenotes/notes/drop-senlin-aadc2bd1eb50d046.yaml new file mode 100644 index 0000000000..fbb09ccad6 --- /dev/null +++ b/releasenotes/notes/drop-senlin-aadc2bd1eb50d046.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + ``Senlin`` container images have been dropped. diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml index f1dd42555a..ec273711c1 100644 --- a/roles/kolla-build-config/defaults/main.yml +++ b/roles/kolla-build-config/defaults/main.yml @@ -57,7 +57,6 @@ kolla_build_sources: openstack/nova: nova-base openstack/octavia: octavia-base openstack/sahara: sahara-base - openstack/senlin: senlin-base openstack/skyline: skyline-base openstack/solum: solum-base swift-base: openstack/swift @@ -85,7 +84,6 @@ kolla_build_sources: openstack/neutron-vpnaas-dashboard: horizon-plugin-neutron-vpnaas-dashboard openstack/octavia-dashboard: horizon-plugin-octavia-dashboard openstack/sahara-dashboard: horizon-plugin-sahara-dashboard - openstack/senlin-dashboard: horizon-plugin-senlin-dashboard openstack/solum-dashboard: horizon-plugin-solum-dashboard openstack/tacker-horizon: horizon-plugin-tacker-dashboard openstack/trove-dashboard: horizon-plugin-trove-dashboard