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

Merge pull request #550 from pemontto/master

Browse source 
Fix template conditional
This commit is contained in:
Michael Russell 2019-05-02 16:56:25 +02:00 • committed by GitHub
commit adba13bcd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tasks/compatibility-variables.yml
View file

@ -23,7 +23,7 @@
es_open_xpack: false es_open_xpack: false
when: "es_version is version_compare('6.3.0', '<')" when: "es_version is version_compare('6.3.0', '<')"
- name: If this is an older version we need to install X-Pack as a plugin and use a differet users command - name: If this is an older version we need to install X-Pack as a plugin and use a different users command
set_fact: set_fact:
es_install_xpack: true es_install_xpack: true
es_xpack_users_command: "x-pack/users" es_xpack_users_command: "x-pack/users"

2
tasks/elasticsearch-template.yml
View file

@ -20,7 +20,7 @@
status_code: 200 status_code: 200
body_format: json body_format: json
body: "{{ lookup('file', item) }}" body: "{{ lookup('file', item) }}"
when: load_templates.changed and es_start_service and not es_enable_xpack or not es_xpack_features is defined or "security" not in es_xpack_features when: load_templates.changed and es_start_service and (not es_enable_xpack or not es_xpack_features is defined or "security" not in es_xpack_features)
with_fileglob: with_fileglob:
- "{{ es_templates_fileglob | default('') }}" - "{{ es_templates_fileglob | default('') }}"
run_once: True run_once: True