diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2024-04-15 15:11:56 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2024-04-16 12:22:36 +0000 |
| commit | a9bde9b1ac5651f2859b4bcc00f273bf772b8198 (patch) | |
| tree | 04b5fc6310f89576038e55e2188a3c99462c3833 /docker | |
| parent | 4d9379ecc8d3c66902763aca0ae14643350a8976 (diff) | |
| download | kolla-a9bde9b1ac5651f2859b4bcc00f273bf772b8198.tar.gz kolla-a9bde9b1ac5651f2859b4bcc00f273bf772b8198.zip | |
Drop Solum
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: I387e5c345cd5ea45e9231b9ce5baf58a8d74caf9
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/extend_start.sh | 8 | ||||
| -rw-r--r-- | docker/solum/solum-api/Dockerfile.j2 | 14 | ||||
| -rw-r--r-- | docker/solum/solum-api/extend_start.sh | 8 | ||||
| -rw-r--r-- | docker/solum/solum-base/Dockerfile.j2 | 27 | ||||
| -rw-r--r-- | docker/solum/solum-base/extend_start.sh | 10 | ||||
| -rw-r--r-- | docker/solum/solum-conductor/Dockerfile.j2 | 11 | ||||
| -rw-r--r-- | docker/solum/solum-deployer/Dockerfile.j2 | 11 | ||||
| -rw-r--r-- | docker/solum/solum-worker/Dockerfile.j2 | 11 |
8 files changed, 0 insertions, 100 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index a9bce11b6..867fecb57 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -155,13 +155,6 @@ function config_octavia_dashboard { "${SITE_PACKAGES}/openstack_dashboard/local/enabled/_1482_project_load_balancer_panel.py" } -function config_solum_dashboard { - for file in ${SITE_PACKAGES}/solumdashboard/local/enabled/_*[^__].py; do - config_dashboard "${ENABLE_SOLUM:-no}" \ - "${SITE_PACKAGES}/solumdashboard/local/enabled/${file##*/}" \ - "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" - done -} function config_tacker_dashboard { for file in ${SITE_PACKAGES}/tacker_horizon/enabled/_*[^__].py; do @@ -249,7 +242,6 @@ config_masakari_dashboard config_mistral_dashboard config_neutron_vpnaas_dashboard config_octavia_dashboard -config_solum_dashboard config_tacker_dashboard config_trove_dashboard config_venus_dashboard diff --git a/docker/solum/solum-api/Dockerfile.j2 b/docker/solum/solum-api/Dockerfile.j2 deleted file mode 100644 index 92459029d..000000000 --- a/docker/solum/solum-api/Dockerfile.j2 +++ /dev/null @@ -1,14 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block solum_api_header %}{% endblock %} - -COPY extend_start.sh /usr/local/bin/kolla_solum_extend_start -RUN chmod 644 /usr/local/bin/kolla_solum_extend_start - -{% block solum_api_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER solum diff --git a/docker/solum/solum-api/extend_start.sh b/docker/solum/solum-api/extend_start.sh deleted file mode 100644 index fd9625c83..000000000 --- a/docker/solum/solum-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 - solum-db-manage --config-file /etc/solum/solum.conf upgrade head - exit 0 -fi diff --git a/docker/solum/solum-base/Dockerfile.j2 b/docker/solum/solum-base/Dockerfile.j2 deleted file mode 100644 index 4de86d59f..000000000 --- a/docker/solum/solum-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 solum_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='solum') }} - -ADD solum-base-archive /solum-base-source - -{% set solum_base_pip_packages = [ - '/solum' -] %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN ln -s solum-base-source/* solum \ - && {{ macros.install_pip(solum_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/solum \ - && cp -r /solum/etc/solum/* /etc/solum/ \ - && touch /usr/local/bin/kolla_solum_extend_start \ - && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_solum_extend_start - -{% block solum_base_footer %}{% endblock %} diff --git a/docker/solum/solum-base/extend_start.sh b/docker/solum/solum-base/extend_start.sh deleted file mode 100644 index b80d4bfe0..000000000 --- a/docker/solum/solum-base/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/solum" ]]; then - mkdir -p /var/log/kolla/solum -fi -if [[ $(stat -c %a /var/log/kolla/solum) != "755" ]]; then - chmod 755 /var/log/kolla/solum -fi - -. /usr/local/bin/kolla_solum_extend_start diff --git a/docker/solum/solum-conductor/Dockerfile.j2 b/docker/solum/solum-conductor/Dockerfile.j2 deleted file mode 100644 index b5adbbd08..000000000 --- a/docker/solum/solum-conductor/Dockerfile.j2 +++ /dev/null @@ -1,11 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block solum_conductor_header %}{% endblock %} - -{% block solum_conductor_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER solum diff --git a/docker/solum/solum-deployer/Dockerfile.j2 b/docker/solum/solum-deployer/Dockerfile.j2 deleted file mode 100644 index 50ad84752..000000000 --- a/docker/solum/solum-deployer/Dockerfile.j2 +++ /dev/null @@ -1,11 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block solum_deployer_header %}{% endblock %} - -{% block solum_deployer_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER solum diff --git a/docker/solum/solum-worker/Dockerfile.j2 b/docker/solum/solum-worker/Dockerfile.j2 deleted file mode 100644 index 049a33dd6..000000000 --- a/docker/solum/solum-worker/Dockerfile.j2 +++ /dev/null @@ -1,11 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block solum_worker_header %}{% endblock %} - -{% block solum_worker_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER solum |
