From fc400862b1cc8a46db2d4ccbbd8cffa34b9223eb Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Wed, 4 Jan 2017 16:39:00 +0000 Subject: [PATCH] Fix for license update --- handlers/elasticsearch-templates.yml | 6 ++++++ handlers/main.yml | 7 ------- handlers/shield/elasticsearch-shield.yml | 5 +++++ handlers/shield/elasticsearch-xpack-activation.yml | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/handlers/elasticsearch-templates.yml b/handlers/elasticsearch-templates.yml index bad2226..4595ef6 100644 --- a/handlers/elasticsearch-templates.yml +++ b/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 diff --git a/handlers/main.yml b/handlers/main.yml index 524d130..00df18e 100644 --- a/handlers/main.yml +++ b/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 diff --git a/handlers/shield/elasticsearch-shield.yml b/handlers/shield/elasticsearch-shield.yml index ca4f63f..61620b3 100644 --- a/handlers/shield/elasticsearch-shield.yml +++ b/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 != '' diff --git a/handlers/shield/elasticsearch-xpack-activation.yml b/handlers/shield/elasticsearch-xpack-activation.yml index 948bd83..063a9e9 100644 --- a/handlers/shield/elasticsearch-xpack-activation.yml +++ b/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