Merge "Remove retired Searchlight support"

README.rst

@@ -68,7 +68,6 @@ Kolla-Ansible deploys containers for 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/>`__

ansible/group_vars/all.yml

@@ -456,8 +456,6 @@ redis_sentinel_port: "26379"
 
 sahara_api_port: "8386"
 
-searchlight_api_port: "9393"
-
 senlin_internal_fqdn: "{{ kolla_internal_fqdn }}"
 senlin_external_fqdn: "{{ kolla_external_fqdn }}"
 senlin_api_port: "8778"
@@ -616,7 +614,6 @@ enable_horizon_murano: "{{ enable_murano | bool }}"
 enable_horizon_neutron_vpnaas: "{{ enable_neutron_vpnaas | bool }}"
 enable_horizon_octavia: "{{ enable_octavia | bool }}"
 enable_horizon_sahara: "{{ enable_sahara | bool }}"
-enable_horizon_searchlight: "{{ enable_searchlight | bool }}"
 enable_horizon_senlin: "{{ enable_senlin | bool }}"
 enable_horizon_solum: "{{ enable_solum | bool }}"
 enable_horizon_tacker: "{{ enable_tacker | bool }}"
@@ -674,7 +671,6 @@ enable_qdrouterd: "{{ 'yes' if om_rpc_transport == 'amqp' else 'no' }}"
 enable_rally: "no"
 enable_redis: "no"
 enable_sahara: "no"
-enable_searchlight: "no"
 enable_senlin: "no"
 enable_skydive: "no"
 enable_solum: "no"

ansible/inventory/all-in-one

@@ -209,9 +209,6 @@ control
 [rally:children]
 control
 
-[searchlight:children]
-control
-
 [octavia:children]
 control
 
@@ -610,13 +607,6 @@ senlin
 [senlin-health-manager:children]
 senlin
 
-# Searchlight
-[searchlight-api:children]
-searchlight
-
-[searchlight-listener:children]
-searchlight
-
 # Octavia
 [octavia-api:children]
 octavia

ansible/inventory/multinode

@@ -227,9 +227,6 @@ control
 [rally:children]
 control
 
-[searchlight:children]
-control
-
 [octavia:children]
 control
 
@@ -628,13 +625,6 @@ senlin
 [senlin-health-manager:children]
 senlin
 
-# Searchlight
-[searchlight-api:children]
-searchlight
-
-[searchlight-listener:children]
-searchlight
-
 # Octavia
 [octavia-api:children]
 octavia

ansible/roles/barbican/defaults/main.yml

@@ -146,7 +146,7 @@ barbican_ks_roles:
 ####################
 barbican_notification_topics:
   - name: notifications
-    enabled: "{{ enable_ceilometer | bool or enable_searchlight | bool }}"
+    enabled: "{{ enable_ceilometer | bool }}"
 
 barbican_enabled_notification_topics: "{{ barbican_notification_topics | selectattr('enabled', 'equalto', true) | list }}"
 

ansible/roles/common/defaults/main.yml

@@ -166,8 +166,6 @@ fluentd_input_openstack_services:
     enabled: "{{ enable_rally | bool }}"
   - name: sahara
     enabled: "{{ enable_sahara | bool }}"
-  - name: searchlight
-    enabled: "{{ enable_searchlight | bool }}"
   - name: senlin
     enabled: "{{ enable_senlin | bool }}"
   - name: solum

ansible/roles/common/tasks/config.yml

@@ -212,7 +212,6 @@
       - { name: "rabbitmq", enabled: "{{ enable_rabbitmq | bool }}" }
       - { name: "rally", enabled: "{{ enable_rally | bool }}" }
       - { name: "sahara", enabled: "{{ enable_sahara | bool }}" }
-      - { name: "searchlight", enabled: "{{ enable_searchlight | bool }}" }
       - { name: "senlin", enabled: "{{ enable_senlin | bool }}" }
       - { name: "skydive", enabled: "{{ enable_skydive | bool }}" }
       - { name: "solum", enabled: "{{ enable_solum | bool }}" }

ansible/roles/common/templates/cron-logrotate-searchlight.conf.j2

-"/var/log/kolla/searchlight/*.log"
-{
-}

ansible/roles/glance/defaults/main.yml

@@ -96,7 +96,7 @@ glance_ks_users:
 ####################
 glance_notification_topics:
   - name: notifications
-    enabled: "{{ enable_ceilometer | bool or enable_searchlight | bool }}"
+    enabled: "{{ enable_ceilometer | bool }}"
 
 glance_enabled_notification_topics: "{{ glance_notification_topics | selectattr('enabled', 'equalto', true) | list }}"
 

ansible/roles/haproxy/tasks/precheck.yml

@@ -767,19 +767,6 @@
     - haproxy_stat.find('sahara_api') == -1
     - haproxy_vip_prechecks
 
-- name: Checking free port for Searchlight API HAProxy
-  wait_for:
-    host: "{{ kolla_internal_vip_address }}"
-    port: "{{ searchlight_api_port }}"
-    connect_timeout: 1
-    timeout: 1
-    state: stopped
-  when:
-    - enable_searchlight | bool
-    - inventory_hostname in groups['haproxy']
-    - haproxy_stat.find('searchlight_api') == -1
-    - haproxy_vip_prechecks
-
 - name: Checking free port for Senlin API HAProxy
   wait_for:
     host: "{{ kolla_internal_vip_address }}"

ansible/roles/horizon/defaults/main.yml

@@ -24,7 +24,6 @@ horizon_services:
       ENABLE_NEUTRON_VPNAAS: "{{ 'yes' if enable_horizon_neutron_vpnaas | bool else 'no' }}"
       ENABLE_OCTAVIA: "{{ 'yes' if enable_horizon_octavia | bool else 'no' }}"
       ENABLE_SAHARA: "{{ 'yes' if enable_horizon_sahara | bool else 'no' }}"
-      ENABLE_SEARCHLIGHT: "{{ 'yes' if enable_horizon_searchlight | bool else 'no' }}"
       ENABLE_SENLIN: "{{ 'yes' if enable_horizon_senlin | bool else 'no' }}"
       ENABLE_SOLUM: "{{ 'yes' if enable_horizon_solum | bool else 'no' }}"
       ENABLE_TACKER: "{{ 'yes' if enable_horizon_tacker | bool else 'no' }}"

ansible/roles/horizon/tasks/config.yml

@@ -41,7 +41,6 @@
     - { name: "nova", enabled: "{{ enable_nova_horizon_policy_file }}" }
     - { name: "octavia", enabled: "{{ enable_horizon_octavia }}" }
     - { name: "sahara", enabled: "{{ enable_horizon_sahara }}" }
-    - { name: "searchlight", enabled: "{{ enable_horizon_searchlight }}" }
     - { name: "senlin", enabled: "{{ enable_horizon_senlin }}" }
     - { name: "solum", enabled: "{{ enable_horizon_solum }}" }
     - { name: "tacker", enabled: "{{ enable_horizon_tacker }}" }

ansible/roles/neutron/defaults/main.yml

@@ -636,7 +636,7 @@ neutron_service_plugins: "{{ service_plugins | selectattr('enabled', 'equalto',
 ####################
 neutron_notification_topics:
   - name: notifications
-    enabled: "{{ enable_ceilometer | bool or enable_searchlight | bool or enable_neutron_infoblox_ipam_agent | bool }}"
+    enabled: "{{ enable_ceilometer | bool or enable_neutron_infoblox_ipam_agent | bool }}"
   - name: notifications_designate
     enabled: "{{ enable_designate | bool }}"
   - name: vitrage_notifications

ansible/roles/nova-cell/defaults/main.yml

@@ -467,7 +467,7 @@ nova_cell_conductor_has_api_database: "yes"
 ####################
 nova_notification_topics:
   - name: notifications
-    enabled: "{{ enable_ceilometer | bool or enable_searchlight | bool or enable_neutron_infoblox_ipam_agent | bool }}"
+    enabled: "{{ enable_ceilometer | bool or enable_neutron_infoblox_ipam_agent | bool }}"
   - name: notifications_designate
     enabled: "{{ enable_designate | bool }}"
   - name: vitrage_notifications

ansible/roles/nova-cell/templates/nova.conf.j2

@@ -26,7 +26,7 @@ compute_driver = libvirt.LibvirtDriver
 # Though my_ip is not used directly, lots of other variables use $my_ip
 my_ip = {{ api_interface_address }}
 
-{% if enable_ceilometer | bool or enable_searchlight | bool or enable_designate | bool %}
+{% if enable_ceilometer | bool or enable_designate | bool %}
 instance_usage_audit = True
 instance_usage_audit_period = hour
 {% if enable_watcher | bool %}
@@ -217,15 +217,9 @@ cafile = {{ openstack_cacert }}
 valid_interfaces = internal
 
 [notifications]
-{% if enable_ceilometer | bool or enable_searchlight | bool or enable_designate | bool or enable_neutron_infoblox_ipam_agent | bool %}
+{% if enable_ceilometer | bool or enable_designate | bool or enable_neutron_infoblox_ipam_agent | bool %}
 notify_on_state_change = vm_and_task_state
 {% endif %}
-{% if not enable_searchlight | bool %}
-notification_format = unversioned
-{% else %}
-notification_format = both
-{% endif %}
-
 
 {% if enable_osprofiler | bool %}
 [profiler]

ansible/roles/nova/defaults/main.yml

@@ -224,7 +224,7 @@ nova_ks_users:
 ####################
 nova_notification_topics:
   - name: notifications
-    enabled: "{{ enable_ceilometer | bool or enable_searchlight | bool or enable_neutron_infoblox_ipam_agent | bool }}"
+    enabled: "{{ enable_ceilometer | bool or enable_neutron_infoblox_ipam_agent | bool }}"
   - name: notifications_designate
     enabled: "{{ enable_designate | bool }}"
   - name: vitrage_notifications

ansible/roles/nova/templates/nova.conf.j2

@@ -13,7 +13,7 @@ allow_resize_to_same_host = true
 # Though my_ip is not used directly, lots of other variables use $my_ip
 my_ip = {{ api_interface_address }}
 
-{% if enable_ceilometer | bool or enable_searchlight | bool or enable_designate | bool %}
+{% if enable_ceilometer | bool or enable_designate | bool %}
 instance_usage_audit = True
 instance_usage_audit_period = hour
 {% endif %}
@@ -176,15 +176,9 @@ cafile = {{ openstack_cacert }}
 valid_interfaces = internal
 
 [notifications]
-{% if enable_ceilometer | bool or enable_searchlight | bool or enable_designate | bool or enable_neutron_infoblox_ipam_agent | bool %}
+{% if enable_ceilometer | bool or enable_designate | bool or enable_neutron_infoblox_ipam_agent | bool %}
 notify_on_state_change = vm_and_task_state
 {% endif %}
-{% if not enable_searchlight | bool %}
-notification_format = unversioned
-{% else %}
-notification_format = both
-{% endif %}
-
 
 {% if enable_osprofiler | bool %}
 [profiler]

ansible/roles/placement/defaults/main.yml

@@ -84,7 +84,7 @@ openstack_placement_auth: "{{ openstack_auth }}"
 ####################
 placement_notification_topics:
   - name: notifications
-    enabled: "{{ enable_ceilometer | bool or enable_searchlight | bool or enable_neutron_infoblox_ipam_agent | bool }}"
+    enabled: "{{ enable_ceilometer | bool or enable_neutron_infoblox_ipam_agent | bool }}"
   - name: notifications_designate
     enabled: "{{ enable_designate | bool }}"
 

ansible/roles/searchlight/defaults/main.yml

----
-project_name: "searchlight"
-
-searchlight_services:
-  searchlight-api:
-    container_name: searchlight_api
-    group: searchlight-api
-    enabled: true
-    image: "{{ searchlight_api_image_full }}"
-    volumes: "{{ searchlight_api_default_volumes + searchlight_api_extra_volumes }}"
-    dimensions: "{{ searchlight_api_dimensions }}"
-    haproxy:
-      searchlight_api:
-        enabled: "{{ enable_searchlight }}"
-        mode: "http"
-        external: false
-        port: "{{ searchlight_api_port }}"
-      searchlight_api_external:
-        enabled: "{{ enable_searchlight }}"
-        mode: "http"
-        external: true
-        port: "{{ searchlight_api_port }}"
-  searchlight-listener:
-    container_name: searchlight_listener
-    group: searchlight-listener
-    enabled: true
-    image: "{{ searchlight_listener_image_full }}"
-    volumes: "{{ searchlight_listener_default_volumes + searchlight_listener_extra_volumes }}"
-    dimensions: "{{ searchlight_listener_dimensions }}"
-
-####################
-# Elasticsearch
-####################
-searchlight_elasticsearch_url: "{{ elasticsearch_address | put_address_in_context('url') }}:{{ elasticsearch_port }}"
-
-####################
-# Docker
-####################
-searchlight_install_type: "{{ kolla_install_type }}"
-searchlight_tag: "{{ openstack_tag }}"
-
-searchlight_listener_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ searchlight_install_type }}-searchlight-listener"
-searchlight_listener_tag: "{{ searchlight_tag }}"
-searchlight_listener_image_full: "{{ searchlight_listener_image }}:{{ searchlight_listener_tag }}"
-
-searchlight_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ searchlight_install_type }}-searchlight-api"
-searchlight_api_tag: "{{ searchlight_tag }}"
-searchlight_api_image_full: "{{ searchlight_api_image }}:{{ searchlight_api_tag }}"
-
-searchlight_api_dimensions: "{{ default_container_dimensions }}"
-searchlight_listener_dimensions: "{{ default_container_dimensions }}"
-
-searchlight_api_default_volumes:
-  - "{{ node_config_directory }}/searchlight-api/:{{ container_config_directory }}/:ro"
-  - "/etc/localtime:/etc/localtime:ro"
-  - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_os_family == 'Debian' else '' }}"
-  - "kolla_logs:/var/log/kolla/"
-searchlight_listener_default_volumes:
-  - "{{ node_config_directory }}/searchlight-listener/:{{ container_config_directory }}/:ro"
-  - "/etc/localtime:/etc/localtime:ro"
-  - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_os_family == 'Debian' else '' }}"
-  - "kolla_logs:/var/log/kolla/"
-
-searchlight_extra_volumes: "{{ default_extra_volumes }}"
-searchlight_api_extra_volumes: "{{ searchlight_extra_volumes }}"
-searchlight_listener_extra_volumes: "{{ searchlight_extra_volumes }}"
-
-####################
-# OpenStack
-####################
-searchlight_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ searchlight_api_port }}"
-searchlight_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ searchlight_api_port }}"
-searchlight_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ searchlight_api_port }}"
-
-searchlight_logging_debug: "{{ openstack_logging_debug }}"
-
-searchlight_keystone_user: "searchlight"
-
-openstack_searchlight_auth: "{{ openstack_auth }}"
-
-
-####################
-# Notifications
-####################
-searchlight_notification_topics:
-  - name: notifications
-    enabled: "{{ enable_ceilometer | bool }}"
-
-searchlight_enabled_notification_topics: "{{ searchlight_notification_topics | selectattr('enabled', 'equalto', true) | list }}"
-
-####################
-# Keystone
-####################
-searchlight_ks_services:
-  - name: "searchlight"
-    type: "search"
-    description: "Openstack Index Service"
-    endpoints:
-      - {'interface': 'admin', 'url': '{{ searchlight_admin_endpoint }}'}
-      - {'interface': 'internal', 'url': '{{ searchlight_internal_endpoint }}'}
-      - {'interface': 'public', 'url': '{{ searchlight_public_endpoint }}'}
-
-searchlight_ks_users:
-  - project: "service"
-    user: "{{ searchlight_keystone_user }}"
-    password: "{{ searchlight_keystone_password }}"
-    role: "admin"

ansible/roles/searchlight/handlers/main.yml

----
-- name: Restart searchlight-api container
-  vars:
-    service_name: "searchlight-api"
-    service: "{{ searchlight_services[service_name] }}"
-  become: true
-  kolla_docker:
-    action: "recreate_or_restart_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ service.container_name }}"
-    image: "{{ service.image }}"
-    volumes: "{{ service.volumes }}"
-    dimensions: "{{ service.dimensions }}"
-  when:
-    - kolla_action != "config"
-
-- name: Restart searchlight-listener container
-  vars:
-    service_name: "searchlight-listener"
-    service: "{{ searchlight_services[service_name] }}"
-  become: true
-  kolla_docker:
-    action: "recreate_or_restart_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ service.container_name }}"
-    image: "{{ service.image }}"
-    volumes: "{{ service.volumes }}"
-    dimensions: "{{ service.dimensions }}"
-  when:
-    - kolla_action != "config"