Fix for license update

handlers/elasticsearch-templates.yml

@@ -1,5 +1,11 @@
 ---
 
+- name: Ensure elasticsearch is started
+  service: name={{instance_init_script | basename}} state=started enabled=yes
+
+- name: Wait for elasticsearch to startup
+  wait_for: host={{es_api_host}} port={{es_api_port}} delay=10
+
 - name: Get template files
   find: paths="/etc/elasticsearch/templates" patterns="*.json"
   register: templates

handlers/main.yml

@@ -6,13 +6,6 @@
   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))
 
-# Assumes all handlers need to be started as likely to make HTTP calls
-- name: Ensure elasticsearch is started
-  service: name={{instance_init_script | basename}} state=started enabled=yes
-
-- name: Wait for elasticsearch to startup
-  wait_for: host={{es_api_host}} port={{es_api_port}} delay=10
-
 # All security specific actions should go in here
 - name: activate-shield
   include: ./handlers/shield/elasticsearch-shield.yml

handlers/shield/elasticsearch-shield.yml

@@ -1,5 +1,10 @@
 ---
+- name: Ensure elasticsearch is started
+  service: name={{instance_init_script | basename}} state=started enabled=yes
 
+- name: Wait for elasticsearch to startup
+  wait_for: host={{es_api_host}} port={{es_api_port}} delay=10
+  
 - name: activate-license
   include: ./handlers/shield/elasticsearch-xpack-activation.yml
   when: es_enable_xpack and es_xpack_license is defined and es_xpack_license != ''

handlers/shield/elasticsearch-xpack-activation.yml

@@ -26,7 +26,7 @@
     body: "{{ es_xpack_license }}"
     return_content: yes
   register: license_activated
-  no_log: True
+  #no_log: True
   when: '"shield" in es_xpack_features'
   failed_when: >
     license_activated.status != 200 or