aljaz/ansible-elasticsearch
1
0
Fork 0
mirror of https://github.com/aljazceru/ansible-elasticsearch.git synced 2025-12-18 17:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for conditional execution as a task

Browse Source
This commit is contained in:
Dale McDiarmid
2017-03-15 17:24:10 -04:00
parent 595368f873
commit 4e8af6ced5
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/xpack/security/elasticsearch-security-file.yml
View File

@@ -21,8 +21,8 @@
- name: Remove Users - name: Remove Users
command: > command: >
{{es_home}}/bin/x-pack/users userdel {{item}} {{es_home}}/bin/x-pack/users userdel {{item}}
when: manage_file_users and (users_to_remove | length > 0)
with_items: "{{users_to_remove | default([])}}" with_items: "{{users_to_remove | default([])}}"
when: manage_file_users and (users_to_remove | length > 0)
environment: environment:
CONF_DIR: "{{ conf_dir }}" CONF_DIR: "{{ conf_dir }}"
ES_HOME: "{{es_home}}" ES_HOME: "{{es_home}}"

18
tasks/xpack/security/elasticsearch-security-native.yml
View File

@@ -46,7 +46,10 @@
password: "{{es_api_basic_auth_password}}" password: "{{es_api_basic_auth_password}}"
force_basic_auth: yes force_basic_auth: yes
when: manage_native_users and users_to_remove | length > 0 when: manage_native_users and users_to_remove | length > 0
with_items: "{{users_to_remove}}" with_items: "{{users_to_remove | default([]) }}"
- set_fact: native_users={{ es_users.native }}
when: manage_native_users and es_users.native.keys() > 0
#Overwrite all other users #Overwrite all other users
- name: Update Native Users - name: Update Native Users
@@ -59,9 +62,9 @@
user: "{{es_api_basic_auth_username}}" user: "{{es_api_basic_auth_username}}"
password: "{{es_api_basic_auth_password}}" password: "{{es_api_basic_auth_password}}"
force_basic_auth: yes force_basic_auth: yes
when: manage_native_users and es_users.native.keys() > 0 when: manage_native_users and native_users.keys() > 0
no_log: True no_log: True
with_dict: "{{es_users.native}}" with_dict: "{{native_users | default({}) }}"
#List current roles not. inc those reserved #List current roles not. inc those reserved
- name: List Native Roles - name: List Native Roles
@@ -94,9 +97,12 @@
password: "{{es_api_basic_auth_password}}" password: "{{es_api_basic_auth_password}}"
force_basic_auth: yes force_basic_auth: yes
when: manage_native_roles and roles_to_remove | length > 0 when: manage_native_roles and roles_to_remove | length > 0
with_items: "{{roles_to_remove}}" with_items: "{{roles_to_remove | default([]) }}"
- set_fact: native_roles={{ es_roles.native }}
when: manage_native_roles and es_roles.native.keys() > 0
#Update other roles #Update other roles
- name: Update Native Roles - name: Update Native Roles
uri: uri:
@@ -108,5 +114,5 @@
user: "{{es_api_basic_auth_username}}" user: "{{es_api_basic_auth_username}}"
password: "{{es_api_basic_auth_password}}" password: "{{es_api_basic_auth_password}}"
force_basic_auth: yes force_basic_auth: yes
when: manage_native_roles and es_roles.native.keys() > 0 when: manage_native_roles and native_roles.keys() > 0
with_dict: "{{es_roles.native}}" with_dict: "{{ native_roles | default({})}}"