diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla index dee9eceae483cb77ddf034aec8a15b78ad52f1c3..f3a35b28e5f3e2702cc063cec22bb5972196c23d 100644 --- a/ansible/group_vars/all/kolla +++ b/ansible/group_vars/all/kolla @@ -231,8 +231,6 @@ overcloud_container_image_regex_map: enabled: "{{ kolla_enable_redis | bool }}" - regex: sahara enabled: "{{ kolla_enable_sahara | bool }}" - - regex: searchlight - enabled: "{{ kolla_enable_searchlight | bool }}" - regex: senlin enabled: "{{ kolla_enable_senlin | bool }}" - regex: skydive @@ -523,7 +521,6 @@ kolla_enable_qinling: "no" kolla_enable_rally: "no" kolla_enable_redis: "no" kolla_enable_sahara: "no" -kolla_enable_searchlight: "no" kolla_enable_senlin: "no" kolla_enable_skydive: "no" kolla_enable_solum: "no" diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2 index 75e9055ffd2e76a774ff42e5ca7e4948e8170133..f7f0ecb3901760447c9a56cc377fba9f80d8192f 100644 --- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 +++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2 @@ -213,9 +213,6 @@ control [rally:children] control -[searchlight:children] -control - [octavia:children] control diff --git a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2 index c512a34d04e8aff88a4db78dfb3afa6d73c1d1e4..fa227d3a176f4f139865b322dc079b85ee6a0d2d 100644 --- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 +++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2 @@ -414,13 +414,6 @@ senlin [senlin-health-manager:children] senlin -# Searchlight -[searchlight-api:children] -searchlight - -[searchlight-listener:children] -searchlight - # Octavia [octavia-api:children] octavia diff --git a/ansible/roles/kolla-ansible/tests/test-extras.yml b/ansible/roles/kolla-ansible/tests/test-extras.yml index 72c63cf78dc6fd6cf1470e4d1bd4c15b842f058d..70e0055dea40ca21794b92a5d0a1efc4a1e73136 100644 --- a/ansible/roles/kolla-ansible/tests/test-extras.yml +++ b/ansible/roles/kolla-ansible/tests/test-extras.yml @@ -169,7 +169,6 @@ kolla_enable_panko: True kolla_enable_prometheus: True kolla_enable_rally: True - kolla_enable_searchlight: True kolla_enable_sahara: True kolla_enable_senlin: True kolla_enable_skydive: True @@ -300,7 +299,6 @@ #enable_prometheus: True #enable_rally: True #enable_sahara: True - #enable_searchlight: True #enable_skydive: True #enable_solum: True #enable_senlin: True diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml index 01e0d951fe4d260984617cbde2cc185b780968a7..c173753be342b770b56f391768c0acf52dfda51a 100644 --- a/ansible/roles/kolla-ansible/vars/main.yml +++ b/ansible/roles/kolla-ansible/vars/main.yml @@ -119,7 +119,6 @@ kolla_feature_flags: - horizon_octavia - horizon_qinling - horizon_sahara - - horizon_searchlight - horizon_senlin - horizon_solum - horizon_tacker @@ -187,7 +186,6 @@ kolla_feature_flags: - rally - redis - sahara - - searchlight - senlin - skydive - solum diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index ae7a4a9658576ba5327a230a601d2a3e615337b2..23f0c42b38b6ce4ebc19e6c762efc312ecb8130f 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -254,7 +254,6 @@ #kolla_enable_horizon_octavia: #kolla_enable_horizon_qinling: #kolla_enable_horizon_sahara: -#kolla_enable_horizon_searchlight: #kolla_enable_horizon_senlin: #kolla_enable_horizon_solum: #kolla_enable_horizon_tacker: @@ -322,7 +321,6 @@ #kolla_enable_rally: #kolla_enable_redis: #kolla_enable_sahara: -#kolla_enable_searchlight: #kolla_enable_senlin: #kolla_enable_skydive: #kolla_enable_solum: diff --git a/releasenotes/notes/remove-searchlight-support-a164fd550bfc14d4.yaml b/releasenotes/notes/remove-searchlight-support-a164fd550bfc14d4.yaml new file mode 100644 index 0000000000000000000000000000000000000000..03c740b5abe4b14c71d4968d14e5760836c55b57 --- /dev/null +++ b/releasenotes/notes/remove-searchlight-support-a164fd550bfc14d4.yaml @@ -0,0 +1,7 @@ +upgrade: + - | + The ``Searchlight`` project is no longer maintained and + `retired since Wallaby cycle`__ . Its support is also + removed since Wallaby cycle. + + __ http://lists.openstack.org/pipermail/openstack-discuss/2020-November/018637.html