santerikainulainen/ansible-role-elasticsearch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for detecting es version changed

Browse source
This commit is contained in:
Dale McDiarmid 2016-07-24 17:39:44 +01:00
parent 0a269a3d82
commit 9eacd3a5e0
5 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tasks/xpack/elasticsearch-xpack-install.yml
View file

@ -1,7 +1,5 @@
---
- set_fact: es_version_changed=((elasticsearch_install_from_package is defined and elasticsearch_install_from_repo.changed) or (elasticsearch_install_from_package is defined and elasticsearch_install_from_package.changed))
#Test if feature is installed
- shell: "{{es_home}}/bin/plugin list | sed -n '1!p' | grep {{item}}"
register: feature_installed

9
tasks/xpack/elasticsearch-xpack.yml
View file

@ -1,8 +1,10 @@
---
- set_fact: es_version_changed=((elasticsearch_install_from_package is defined and elasticsearch_install_from_repo.changed) or (elasticsearch_install_from_package is defined and elasticsearch_install_from_package.changed))
- set_fact: es_version_changed={{((elasticsearch_install_from_package is defined and elasticsearch_install_from_repo.changed) or (elasticsearch_install_from_package is defined and elasticsearch_install_from_package.changed))}}
#enabling xpack installs the license. Not a xpack feature and does not need to be specified
- debug: msg="{{es_version_changed}}"
#enabling xpack installs the license. Not a xpack feature and does not need to be specified - TODO: we should append it to the list if xpack is enabled and remove this
#Check if license is installed
- name: Check License is installed
@ -10,6 +12,7 @@
{{es_home}}/bin/plugin list | tail -n +2 | grep license
register: license_installed
ignore_errors: yes
failed_when: "'ERROR' in license_installed.stdout"
changed_when: False
environment:
CONF_DIR: "{{ conf_dir }}"
@ -41,7 +44,7 @@
CONF_DIR: "{{ conf_dir }}"
ES_INCLUDE: "{{ instance_default_file }}"
#We loop on all as we may need to remove some features
#We loop on all as we may need to remove some features.
- include: elasticsearch-xpack-install.yml
with_items: "{{supported_xpack_features}}"