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

Merge pull request #261 from konasp/master

Browse source 
Fixing boolean expressions syntax when installing templates/license
This commit is contained in:
Dale McDiarmid 2017-03-13 12:54:34 -07:00 • committed by GitHub
commit 51dc601b57
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
handlers/elasticsearch-templates.yml
View file

@ -17,7 +17,7 @@
status_code: 200 status_code: 200
body_format: json body_format: json
body: "{{ lookup('file', item.path) }}" body: "{{ lookup('file', item.path) }}"
when: not es_enable_xpack or not es_xpack_features is defined or not '"security" in es_xpack_features' when: not es_enable_xpack or not es_xpack_features is defined or "security" not in es_xpack_features
with_items: "{{ templates.files }}" with_items: "{{ templates.files }}"
- name: Install templates with auth - name: Install templates with auth
@ -30,5 +30,5 @@
force_basic_auth: yes force_basic_auth: yes
body_format: json body_format: json
body: "{{ lookup('file', item.path) }}" body: "{{ lookup('file', item.path) }}"
when: es_enable_xpack and es_xpack_features is defined and '"security" in es_xpack_features' when: es_enable_xpack and es_xpack_features is defined and "security" in es_xpack_features
with_items: "{{ templates.files }}" with_items: "{{ templates.files }}"

2
handlers/security/elasticsearch-xpack-activation.yml
View file

@ -9,7 +9,7 @@
return_content: yes return_content: yes
register: license_activated register: license_activated
no_log: True no_log: True
when: not '"security" in es_xpack_features' when: 'not "security" in es_xpack_features'
failed_when: > failed_when: >
license_activated.status != 200 or license_activated.status != 200 or
license_activated.json.license_status is not defined or license_activated.json.license_status is not defined or