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
This commit is contained in:
Ghanshyam Mann
Radosław Piliszek
parent
d66ff8d3a3
commit
60a9b77a47
|
|
@ -100,7 +100,6 @@ Kolla provides images to deploy the following OpenStack projects:
|
|||
- `Panko <https://docs.openstack.org/panko/latest/>`__
|
||||
- `Rally <https://docs.openstack.org/rally/latest/>`__
|
||||
- `Sahara <https://docs.openstack.org/sahara/latest/>`__
|
||||
- `Searchlight <https://docs.openstack.org/searchlight/latest/>`__
|
||||
- `Senlin <https://docs.openstack.org/senlin/latest/>`__
|
||||
- `Solum <https://docs.openstack.org/solum/latest/>`__
|
||||
- `Swift <https://docs.openstack.org/swift/latest/>`__
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
|
@ -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
|
||||
|
|
|
|||
|
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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 %}
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -107,7 +107,6 @@ UNBUILDABLE_IMAGES = {
|
|||
"monasca-base",
|
||||
"monasca-thresh",
|
||||
"nova-mksproxy",
|
||||
"searchlight-base",
|
||||
"solum-base",
|
||||
"vmtp",
|
||||
"zun-base",
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue