aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorGhanshyam Mann <gmann@ghanshyammann.com>2020-11-28 15:55:53 -0600
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2020-12-11 20:22:13 +0100
commit60a9b77a479f58f3109a87c44e5e5ce4f3afdf17 (patch)
tree3a755aafa2e4fd6fb714c23e8b567ed5d4b2244e /docker
parentd66ff8d3a3eaf22c2106fd0cffd26a243a40aa9b (diff)
downloadkolla-60a9b77a479f58f3109a87c44e5e5ce4f3afdf17.tar.gz
kolla-60a9b77a479f58f3109a87c44e5e5ce4f3afdf17.zip
Remove retired Searchlight support and images
Searchlight project is retiring in Wallaby cycle[1]. This commit removes the images and support of Searchlight project before its code is removed. Needed-By: https://review.opendev.org/c/openstack/searchlight/+/764526 [1] http://lists.openstack.org/pipermail/openstack-discuss/2020-November/018637.html Change-Id: Ibcae8d0af13fd1d242912b8703c1d1253e2a1326
Diffstat (limited to 'docker')
-rw-r--r--docker/horizon/extend_start.sh17
-rw-r--r--docker/searchlight/searchlight-api/Dockerfile.j221
-rw-r--r--docker/searchlight/searchlight-api/extend_start.sh8
-rw-r--r--docker/searchlight/searchlight-base/Dockerfile.j238
-rw-r--r--docker/searchlight/searchlight-base/extend_start.sh10
-rw-r--r--docker/searchlight/searchlight-listener/Dockerfile.j218
6 files changed, 0 insertions, 112 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index fabd12dca..a56f155ef 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -204,22 +204,6 @@ function config_sahara_dashboard {
done
}
-function config_searchlight_ui {
- for file in ${SITE_PACKAGES}/searchlight_ui/enabled/_*[^__].py; do
- config_dashboard "${ENABLE_SEARCHLIGHT}" \
- "${SITE_PACKAGES}/searchlight_ui/enabled/${file##*/}" \
- "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
- done
-
- config_dashboard "${ENABLE_SEARCHLIGHT}" \
- "${SITE_PACKAGES}/searchlight_ui/local_settings.d/_1001_search_settings.py" \
- "${SITE_PACKAGES}/openstack_dashboard/local/local_settings.d/_1001_search_settings.py"
-
- config_dashboard "${ENABLE_SEARCHLIGHT}" \
- "${SITE_PACKAGES}/searchlight_ui/conf/searchlight_policy.json" \
- "/etc/openstack-dashboard/searchlight_policy.json"
-}
-
function config_senlin_dashboard {
for file in ${SITE_PACKAGES}/senlin_dashboard/enabled/_*[^__].py; do
config_dashboard "${ENABLE_SENLIN}" \
@@ -335,7 +319,6 @@ config_murano_dashboard
config_neutron_vpnaas_dashboard
config_octavia_dashboard
config_sahara_dashboard
-config_searchlight_ui
config_senlin_dashboard
config_solum_dashboard
config_tacker_dashboard
diff --git a/docker/searchlight/searchlight-api/Dockerfile.j2 b/docker/searchlight/searchlight-api/Dockerfile.j2
deleted file mode 100644
index 2ccd11e06..000000000
--- a/docker/searchlight/searchlight-api/Dockerfile.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}searchlight-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block searchlight_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_searchlight_extend_start
-RUN chmod 755 /usr/local/bin/kolla_searchlight_extend_start
-
-{% block searchlight_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER searchlight
diff --git a/docker/searchlight/searchlight-api/extend_start.sh b/docker/searchlight/searchlight-api/extend_start.sh
deleted file mode 100644
index 3b6339dc6..000000000
--- a/docker/searchlight/searchlight-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
- searchlight-manage index sync --force
- exit 0
-fi
diff --git a/docker/searchlight/searchlight-base/Dockerfile.j2 b/docker/searchlight/searchlight-base/Dockerfile.j2
deleted file mode 100644
index d53a91be1..000000000
--- a/docker/searchlight/searchlight-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 searchlight_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='searchlight') }}
-
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
- && /bin/false
-
-{% elif install_type == 'source' %}
-
-ADD searchlight-base-archive /searchlight-base-source
-
-{% set searchlight_base_pip_packages = [
- '/searchlight'
-] %}
-
-RUN ln -s searchlight-base-source/* searchlight \
- && {{ macros.install_pip(searchlight_base_pip_packages | customizable("pip_packages")) }} \
- && mkdir -p /etc/searchlight \
- && cp -r /searchlight/etc/* /etc/searchlight \
- && chown -R searchlight: /etc/searchlight
-
-{% endif %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN touch /usr/local/bin/kolla_searchlight_extend_start \
- && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_searchlight_extend_start
-
-{% block searchlight_base_footer %}{% endblock %}
diff --git a/docker/searchlight/searchlight-base/extend_start.sh b/docker/searchlight/searchlight-base/extend_start.sh
deleted file mode 100644
index d1a8ea4fb..000000000
--- a/docker/searchlight/searchlight-base/extend_start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/searchlight" ]]; then
- mkdir -p /var/log/kolla/searchlight
-fi
-if [[ $(stat -c %a /var/log/kolla/searchlight) != "755" ]]; then
- chmod 755 /var/log/kolla/searchlight
-fi
-
-. /usr/local/bin/kolla_searchlight_extend_start
diff --git a/docker/searchlight/searchlight-listener/Dockerfile.j2 b/docker/searchlight/searchlight-listener/Dockerfile.j2
deleted file mode 100644
index 0785449d4..000000000
--- a/docker/searchlight/searchlight-listener/Dockerfile.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}searchlight-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block searchlight_listener_header %}{% endblock %}
-
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
- && /bin/false
-
-{% endif %}
-
-{% block searchlight_listener_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER searchlight