8 files changed, 0 insertions, 115 deletions
diff --git a/ansible/roles/elasticsearch/tasks/config.yml b/ansible/roles/elasticsearch/tasks/config.yml
deleted file mode 100644
index 97b4dc5f0..000000000
--- a/ansible/roles/elasticsearch/tasks/config.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- name: Ensuring config directories exist
-  file:
-    path: "{{ node_config_directory }}/{{ item }}"
-    state: "directory"
-    recurse: yes
-  with_items:
-    - "elasticsearch"
-
-- name: Copying over config.json files for services
-  template:
-    src: "{{ item }}.json.j2"
-    dest: "{{ node_config_directory }}/{{ item }}/config.json"
-  with_items:
-    - "elasticsearch"
-
-- name: Copying over elasticsearch.yml
-  template:
-    src: "elasticsearch.yml.j2"
-    dest: "{{ node_config_directory }}/{{ item }}/{{ item }}.yml"
-  with_items:
-    - "elasticsearch"
diff --git a/ansible/roles/elasticsearch/tasks/deploy.yml b/ansible/roles/elasticsearch/tasks/deploy.yml
deleted file mode 100644
index 1f16915ad..000000000
--- a/ansible/roles/elasticsearch/tasks/deploy.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: config.yml
-
-- include: start.yml
diff --git a/ansible/roles/elasticsearch/tasks/main.yml b/ansible/roles/elasticsearch/tasks/main.yml
deleted file mode 100644
index b017e8b4a..000000000
--- a/ansible/roles/elasticsearch/tasks/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- include: "{{ action }}.yml"
diff --git a/ansible/roles/elasticsearch/tasks/precheck.yml b/ansible/roles/elasticsearch/tasks/precheck.yml
deleted file mode 100644
index ed97d539c..000000000
--- a/ansible/roles/elasticsearch/tasks/precheck.yml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/ansible/roles/elasticsearch/tasks/pull.yml b/ansible/roles/elasticsearch/tasks/pull.yml
deleted file mode 100644
index 6dae5004a..000000000
--- a/ansible/roles/elasticsearch/tasks/pull.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: Pulling elasticsearch image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ elasticsearch_image_full }}"
diff --git a/ansible/roles/elasticsearch/tasks/reconfigure.yml b/ansible/roles/elasticsearch/tasks/reconfigure.yml
deleted file mode 100644
index 480746ef4..000000000
--- a/ansible/roles/elasticsearch/tasks/reconfigure.yml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-- name: Ensuring the containers up
-  kolla_docker:
-    name: "{{ item.name }}"
-    action: "get_container_state"
-  register: container_state
-  failed_when: container_state.Running == false
-  when: inventory_hostname in groups[item.group]
-  with_items:
-    - { name: elasticsearch, group: elasticsearch }
-
-- include: config.yml
-
-- name: Check the configs
-  command: docker exec {{ item.name }} /usr/local/bin/kolla_set_configs --check
-  changed_when: false
-  failed_when: false
-  register: check_results
-  when: inventory_hostname in groups[item.group]
-  with_items:
-    - { name: elasticsearch, group: elasticsearch }
-
-# NOTE(jeffrey4l): when config_strategy == 'COPY_ALWAYS'
-# and container env['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE',
-# just remove the container and start again
-- name: Containers config strategy
-  kolla_docker:
-    name: "{{ item.name }}"
-    action: "get_container_env"
-  register: container_envs
-  when: inventory_hostname in groups[item.group]
-  with_items:
-    - { name: elasticsearch, group: elasticsearch }
-
-- name: Remove the containers
-  kolla_docker:
-    name: "{{ item[0]['name'] }}"
-    action: "remove_container"
-  register: remove_containers
-  when:
-    - config_strategy == "COPY_ONCE" or item[1]['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE'
-    - item[2]['rc'] == 1
-    - inventory_hostname in groups[item[0]['group']]
-  with_together:
-    - [{ name: elasticsearch, group: elasticsearch }]
-    - "{{ container_envs.results }}"
-    - "{{ check_results.results }}"
-
-- include: start.yml
-  when: remove_containers.changed
-
-- name: Restart containers
-  kolla_docker:
-    name: "{{ item[0]['name'] }}"
-    action: "restart_container"
-  when:
-    - config_strategy == 'COPY_ALWAYS'
-    - item[1]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE'
-    - item[2]['rc'] == 1
-    - inventory_hostname in groups[item[0]['group']]
-  with_together:
-    - [{ name: elasticsearch, group: elasticsearch }]
-    - "{{ container_envs.results }}"
-    - "{{ check_results.results }}"
diff --git a/ansible/roles/elasticsearch/tasks/start.yml b/ansible/roles/elasticsearch/tasks/start.yml
deleted file mode 100644
index 12b167eda..000000000
--- a/ansible/roles/elasticsearch/tasks/start.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- name: Starting Elasticsearch container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ elasticsearch_image_full }}"
-    name: "elasticsearch"
-    volumes:
-      - "{{ node_config_directory }}/elasticsearch/:{{ container_config_directory }}/"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "elasticsearch:/var/lib/elasticsearch/data"
-  when: inventory_hostname in groups ['elasticsearch']
diff --git a/ansible/roles/elasticsearch/tasks/upgrade.yml b/ansible/roles/elasticsearch/tasks/upgrade.yml
deleted file mode 100644
index 1f16915ad..000000000
--- a/ansible/roles/elasticsearch/tasks/upgrade.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: config.yml
-
-- include: start.yml