remove elasticsearch remnants in antelope cycle

Change-Id: I115b491eca413437926f5bcaf53336151f9a7c0b

4 files changed, 0 insertions, 63 deletions

diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one
index a720a7d06..005054d81 100644
--- a/ansible/inventory/all-in-one
+++ b/ansible/inventory/all-in-one
@@ -230,10 +230,6 @@ common
 [opensearch:children]
 control
 
-# TODO: This is used for cleanup and can be removed in the Antelope cycle.
-[elasticsearch-curator:children]
-opensearch
-
 # Opensearch dashboards
 [opensearch-dashboards:children]
 opensearch
diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode
index b8479c6ae..4ca227428 100644
--- a/ansible/inventory/multinode
+++ b/ansible/inventory/multinode
@@ -248,10 +248,6 @@ common
 [opensearch:children]
 control
 
-# TODO: This is used for cleanup and can be removed in the Antelope cycle.
-[elasticsearch-curator:children]
-opensearch
-
 # Opensearch dashboards
 [opensearch-dashboards:children]
 opensearch
diff --git a/ansible/roles/opensearch/tasks/precheck.yml b/ansible/roles/opensearch/tasks/precheck.yml
index 997c030dd..835316f09 100644
--- a/ansible/roles/opensearch/tasks/precheck.yml
+++ b/ansible/roles/opensearch/tasks/precheck.yml
@@ -11,7 +11,6 @@
     container_engine: "{{ kolla_container_engine }}"
     name:
       - opensearch
-      - elasticsearch
   check_mode: false
   register: container_facts
 
@@ -23,6 +22,5 @@
     timeout: 1
     state: stopped
   when:
-    - container_facts['elasticsearch'] is not defined
     - container_facts['opensearch'] is not defined
     - inventory_hostname in groups['opensearch']
diff --git a/ansible/roles/opensearch/tasks/upgrade.yml b/ansible/roles/opensearch/tasks/upgrade.yml
index f0b8f78cf..2891b64e0 100644
--- a/ansible/roles/opensearch/tasks/upgrade.yml
+++ b/ansible/roles/opensearch/tasks/upgrade.yml
@@ -1,8 +1,4 @@
 ---
-# NOTE: The following tasks assume that the same hosts are used for
-# OpenSearch as were for ElasticSearch / Kibana, and that the
-# OpenSearch endpoint remains the same as ElasticSearch.
-
 - name: Disable shard allocation
   become: true
   vars:
@@ -38,55 +34,6 @@
   register: result
   until: ('status' in result) and result.status == 200
 
-- name: Stop and remove ElasticSearch
-  become: true
-  kolla_docker:
-    action: "stop_and_remove_container"
-    name: "elasticsearch"
-  when:
-    - inventory_hostname in groups['opensearch']
-
-- name: Stop and remove ElasticSearch Curator
-  become: true
-  kolla_docker:
-    action: "stop_and_remove_container"
-    name: "elasticsearch_curator"
-  when:
-    - inventory_hostname in groups['elasticsearch-curator']
-
-- name: Stop and remove Kibana
-  become: true
-  kolla_docker:
-    action: "stop_and_remove_container"
-    name: "kibana"
-  when:
-    - inventory_hostname in groups['opensearch-dashboards']
-
-- name: Delete ElasticSearch load-balancer config
-  file:
-    path: "{{ node_config_directory }}/haproxy/services.d/elasticsearch.cfg"
-    state: "absent"
-  become: true
-  when:
-    - inventory_hostname in groups['loadbalancer']
-
-- name: Delete Kibana load-balancer config
-  file:
-    path: "{{ node_config_directory }}/haproxy/services.d/kibana.cfg"
-    state: "absent"
-  become: true
-  when:
-    - inventory_hostname in groups['loadbalancer']
-
-# TODO: Use the volume name from defaults.yml
-- name: Create OpenSearch Docker volume
-  become: true
-  command: "docker volume create opensearch"
-
-- name: Migrate ElasticSearch data to OpenSearch
-  become: true
-  command: "mv /var/lib/docker/volumes/elasticsearch/_data/nodes /var/lib/docker/volumes/opensearch/_data/"
-
 - import_tasks: config-host.yml
 
 - import_tasks: config.yml