Merge branch 'master' into become-yes

handlers/elasticsearch-templates.yml

@@ -1,37 +0,0 @@
----
-
-- name: Ensure elasticsearch is started
-  become: yes
-  service: name={{instance_init_script | basename}} state=started enabled=yes
-
-- name: Wait for elasticsearch to startup
-  become: yes
-  wait_for: host={{es_api_host}} port={{es_api_port}} delay=10
-
-- name: Get template files
-  become: yes
-  find: paths="/etc/elasticsearch/templates" patterns="*.json"
-  register: templates
-
-- name: Install templates without auth
-  uri:
-    url: "http://{{es_api_host}}:{{es_api_port}}/_template/{{item.path | filename}}"
-    method: PUT
-    status_code: 200
-    body_format: json
-    body: "{{ lookup('file', item.path) }}"
-  when: not es_enable_xpack or not es_xpack_features is defined or "security" not in es_xpack_features
-  with_items: "{{ templates.files }}"
-
-- name: Install templates with auth
-  uri:
-    url: "http://{{es_api_host}}:{{es_api_port}}/_template/{{item.path | filename}}"
-    method: PUT
-    status_code: 200
-    user: "{{es_api_basic_auth_username}}"
-    password: "{{es_api_basic_auth_password}}"
-    force_basic_auth: yes
-    body_format: json
-    body: "{{ lookup('file', item.path) }}"
-  when: es_enable_xpack and es_xpack_features is defined and "security" in es_xpack_features
-  with_items: "{{ templates.files }}"

handlers/main.yml

@@ -1,17 +1,14 @@
+
 - name: reload systemd configuration
   become: yes
   command: systemctl daemon-reload
 
 # Restart service and ensure it is enabled
+
 - name: restart elasticsearch
   become: yes
   service: name={{instance_init_script | basename}} state=restarted enabled=yes
-  when: es_restart_on_change and es_start_service and ((plugin_installed is defined and plugin_installed.changed) or (config_updated is defined and config_updated.changed) or (xpack_state.changed) or (debian_elasticsearch_install_from_repo.changed or redhat_elasticsearch_install_from_repo.changed or elasticsearch_install_from_package.changed))
-
-#Templates are a handler as they need to come after a restart e.g. suppose user removes security on a running node and doesn't
-#specify es_api_basic_auth_username and es_api_basic_auth_password.  The templates will subsequently not be removed if we don't wait for the node to restart.
-#Templates done after restart therefore - as a handler.
-
-- name: load-templates
-  include: ./handlers/elasticsearch-templates.yml
-  when: es_templates
+  when:
+    - es_restart_on_change
+    - es_start_service
+  register: es_restarted