From 4d9379ecc8d3c66902763aca0ae14643350a8976 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 15 Apr 2024 15:04:29 +0200 Subject: Drop Sahara 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: I7b5b032a4175c5390c9b7ff3fbd4c672adcb5325 --- docker/horizon/extend_start.sh | 9 ------- docker/openstack-base/Dockerfile.j2 | 1 - docker/sahara/sahara-api/Dockerfile.j2 | 16 ----------- docker/sahara/sahara-api/extend_start.sh | 8 ------ docker/sahara/sahara-base/Dockerfile.j2 | 45 ------------------------------- docker/sahara/sahara-base/extend_start.sh | 10 ------- docker/sahara/sahara-base/sahara_sudoers | 1 - docker/sahara/sahara-engine/Dockerfile.j2 | 21 --------------- 8 files changed, 111 deletions(-) delete mode 100644 docker/sahara/sahara-api/Dockerfile.j2 delete mode 100644 docker/sahara/sahara-api/extend_start.sh delete mode 100644 docker/sahara/sahara-base/Dockerfile.j2 delete mode 100644 docker/sahara/sahara-base/extend_start.sh delete mode 100644 docker/sahara/sahara-base/sahara_sudoers delete mode 100644 docker/sahara/sahara-engine/Dockerfile.j2 (limited to 'docker') diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 8115556e8..a9bce11b6 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -155,14 +155,6 @@ function config_octavia_dashboard { "${SITE_PACKAGES}/openstack_dashboard/local/enabled/_1482_project_load_balancer_panel.py" } -function config_sahara_dashboard { - for file in ${SITE_PACKAGES}/sahara_dashboard/enabled/_*[^__].py; do - config_dashboard "${ENABLE_SAHARA:-no}" \ - "${SITE_PACKAGES}/sahara_dashboard/enabled/${file##*/}" \ - "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" - done -} - function config_solum_dashboard { for file in ${SITE_PACKAGES}/solumdashboard/local/enabled/_*[^__].py; do config_dashboard "${ENABLE_SOLUM:-no}" \ @@ -257,7 +249,6 @@ config_masakari_dashboard config_mistral_dashboard config_neutron_vpnaas_dashboard config_octavia_dashboard -config_sahara_dashboard config_solum_dashboard config_tacker_dashboard config_trove_dashboard diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 2bfa3a0c6..7ca946102 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -160,7 +160,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python-novaclient', 'python-openstackclient', 'python-qpid-proton', - 'python-saharaclient', 'python-swiftclient', 'python-troveclient', 'python-vitrageclient', diff --git a/docker/sahara/sahara-api/Dockerfile.j2 b/docker/sahara/sahara-api/Dockerfile.j2 deleted file mode 100644 index 585934ff2..000000000 --- a/docker/sahara/sahara-api/Dockerfile.j2 +++ /dev/null @@ -1,16 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}sahara-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block sahara_api_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -COPY extend_start.sh /usr/local/bin/kolla_sahara_extend_start -RUN chmod 644 /usr/local/bin/kolla_sahara_extend_start - -{% block sahara_api_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER sahara diff --git a/docker/sahara/sahara-api/extend_start.sh b/docker/sahara/sahara-api/extend_start.sh deleted file mode 100644 index 8054dd698..000000000 --- a/docker/sahara/sahara-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 - sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head - exit 0 -fi diff --git a/docker/sahara/sahara-base/Dockerfile.j2 b/docker/sahara/sahara-base/Dockerfile.j2 deleted file mode 100644 index 713795444..000000000 --- a/docker/sahara/sahara-base/Dockerfile.j2 +++ /dev/null @@ -1,45 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block sahara_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='sahara') }} - -{% if base_package_type == 'rpm' %} - {% set sahara_base_packages = ['openssh'] %} -{% elif base_package_type == 'deb' %} - {% set sahara_base_packages = ['openssh-client'] %} -{% endif %} -{{ macros.install_packages(sahara_base_packages | customizable("packages")) }} - -ADD sahara-base-archive /sahara-base-source -ADD plugins-archive / - -{% set sahara_base_pip_packages = [ - '/sahara' -] %} -{% set sahara_base_plugins_pip_packages = [ - '/plugins/*', -] %} - -COPY sahara_sudoers /etc/sudoers.d/kolla_sahara_sudoers -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN ln -s sahara-base-source/* sahara \ - && {{ macros.install_pip(sahara_base_pip_packages | customizable("pip_packages")) }} \ - && if [ "$(ls /plugins)" ]; then \ - {{ macros.install_pip(sahara_base_plugins_pip_packages) }}; \ - fi \ - && mkdir -p /etc/sahara \ - && cp -r /sahara/etc/sahara/* /etc/sahara/ \ - && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/sahara/rootwrap.conf \ - && chmod 750 /etc/sudoers.d \ - && chmod 640 /etc/sudoers.d/kolla_sahara_sudoers \ - && touch /usr/local/bin/kolla_sahara_extend_start \ - && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_sahara_extend_start - -{% block sahara_base_footer %}{% endblock %} diff --git a/docker/sahara/sahara-base/extend_start.sh b/docker/sahara/sahara-base/extend_start.sh deleted file mode 100644 index 8245204d5..000000000 --- a/docker/sahara/sahara-base/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/sahara" ]]; then - mkdir -p /var/log/kolla/sahara -fi -if [[ $(stat -c %a /var/log/kolla/sahara) != "755" ]]; then - chmod 755 /var/log/kolla/sahara -fi - -. /usr/local/bin/kolla_sahara_extend_start diff --git a/docker/sahara/sahara-base/sahara_sudoers b/docker/sahara/sahara-base/sahara_sudoers deleted file mode 100644 index bd8bfeebd..000000000 --- a/docker/sahara/sahara-base/sahara_sudoers +++ /dev/null @@ -1 +0,0 @@ -%kolla ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/sahara-rootwrap /etc/sahara/rootwrap.conf * diff --git a/docker/sahara/sahara-engine/Dockerfile.j2 b/docker/sahara/sahara-engine/Dockerfile.j2 deleted file mode 100644 index 9063e909d..000000000 --- a/docker/sahara/sahara-engine/Dockerfile.j2 +++ /dev/null @@ -1,21 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}sahara-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block sahara_engine_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - {% set sahara_engine_packages = ['nc'] %} -{% elif base_package_type == 'deb' %} - {% set sahara_engine_packages = ['netcat-openbsd'] %} -{% endif %} - -{{ macros.install_packages(sahara_engine_packages | customizable("packages")) }} - -{% block sahara_engine_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER sahara -- cgit v1.2.3