diff --git a/README.rst b/README.rst
index b062615a2b..27da2a2342 100644
--- a/README.rst
+++ b/README.rst
@@ -100,7 +100,6 @@ Kolla provides images to deploy the following OpenStack projects:
- `Panko `__
- `Rally `__
- `Sahara `__
-- `Searchlight `__
- `Senlin `__
- `Solum `__
- `Swift `__
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index 4a1931b1bf..ad9e052be0 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -69,7 +69,6 @@ rally,C,C,N,C,N,C
redis,C,C,C,C,N,C
rsyslog (deprecated),C,C,C,C,N,C
sahara,C,C,C,C,N,C
-searchlight,N,C,N,C,N,C
senlin,C,C,C,C,N,C
skydive,N,N,N,N,N,N
solum,N,C,N,C,N,C
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 161082b44a..02bdaf69ac 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -70,7 +70,6 @@ rally,C,C,N,C,C,C
redis,C,T,C,C,C,C
rsyslog (deprecated),C,C,C,C,C,C
sahara,C,C,C,C,C,C
-searchlight,N,C,N,C,N,C
senlin,C,C,C,C,C,C
skydive,C,C,C,C,C,C
solum,N,C,N,C,N,C
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index fabd12dcad..a56f155efa 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 2ccd11e06f..0000000000
--- 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 3b6339dc67..0000000000
--- 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 d53a91be18..0000000000
--- 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 d1a8ea4fb5..0000000000
--- 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 0785449d42..0000000000
--- 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
diff --git a/kolla/common/config.py b/kolla/common/config.py
index a2841fdd43..9bcc51007f 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -115,7 +115,6 @@ _PROFILE_OPTS = [
'rally',
'redis',
'sahara',
- 'searchlight',
'senlin',
'solum',
'tacker',
@@ -422,10 +421,6 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/openstack/sahara-dashboard/'
'sahara-dashboard-${openstack_branch}.tar.gz')},
- 'horizon-plugin-searchlight-ui': {
- 'type': 'url',
- 'location': ('$tarballs_base/openstack/searchlight-ui/'
- 'searchlight-ui-${openstack_branch}.tar.gz')},
'horizon-plugin-senlin-dashboard': {
'type': 'url',
'location': ('$tarballs_base/openstack/senlin-dashboard/'
@@ -735,10 +730,6 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/openstack/sahara-plugin-vanilla/'
'sahara-plugin-vanilla-${openstack_branch}.tar.gz')},
- 'searchlight-base': {
- 'type': 'url',
- 'location': ('$tarballs_base/openstack/searchlight/'
- 'searchlight-${openstack_branch}.tar.gz')},
'senlin-base': {
'type': 'url',
'location': ('$tarballs_base/openstack/senlin/'
@@ -953,10 +944,6 @@ USERS = {
'uid': 42441,
'gid': 42441,
},
- 'searchlight-user': {
- 'uid': 42442,
- 'gid': 42442,
- },
'senlin-user': {
'uid': 42443,
'gid': 42443,
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 8a4e48bf33..4644809c1f 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -107,7 +107,6 @@ UNBUILDABLE_IMAGES = {
"monasca-base",
"monasca-thresh",
"nova-mksproxy",
- "searchlight-base",
"solum-base",
"vmtp",
"zun-base",
diff --git a/releasenotes/notes/remove-searchlight-images-8ad630086543a0fe.yaml b/releasenotes/notes/remove-searchlight-images-8ad630086543a0fe.yaml
new file mode 100644
index 0000000000..a931c670aa
--- /dev/null
+++ b/releasenotes/notes/remove-searchlight-images-8ad630086543a0fe.yaml
@@ -0,0 +1,8 @@
+---
+upgrade:
+ - |
+ The ``Searchlight`` project is no longer maintained and
+ `retired since Wallaby cycle`__ . Its images and support
+ is also removed since Wallaby cycle.
+
+ __ http://lists.openstack.org/pipermail/openstack-discuss/2020-November/018637.html
diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml
index fef983fdcb..2ba0362f83 100644
--- a/roles/kolla-build-config/defaults/main.yml
+++ b/roles/kolla-build-config/defaults/main.yml
@@ -69,7 +69,6 @@ kolla_build_sources:
- panko-base
openstack/rally: rally
openstack/sahara: sahara-base
- openstack/searchlight: searchlight-base
openstack/senlin: senlin-base
openstack/solum: solum-base
swift-base: openstack/swift
@@ -100,7 +99,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/searchlight-ui: horizon-plugin-searchlight-ui
openstack/senlin-dashboard: horizon-plugin-senlin-dashboard
openstack/solum-dashboard: horizon-plugin-solum-dashboard
openstack/tacker-horizon: horizon-plugin-tacker-dashboard