hardcode elasticsearch-users command instead of es_xpack_users_command

This variable was introduce to match legacy x-pack/users command before 6.3.
This commit is contained in:
Julien Mailleret 2019-09-05 10:48:24 +02:00
parent ffc6d99915
commit 407dddcae1
No known key found for this signature in database
GPG key ID: F065093271C8DE71
2 changed files with 3 additions and 4 deletions

View file

@ -9,7 +9,6 @@
- name: Set the defaults here otherwise they can't be overriden in the same play if the role is called twice
set_fact:
es_repo_name: "{{ es_major_version }}"
es_xpack_users_command: "elasticsearch-users"
es_package_name: "elasticsearch"
es_other_package_name: "elasticsearch-oss"
es_other_repo_name: "{{ 'oss-' + es_major_version }}"

View file

@ -44,7 +44,7 @@
- name: Remove Users
become: yes
command: >
{{es_home}}/bin/{{es_xpack_users_command}} userdel {{item}}
{{es_home}}/bin/elasticsearch-users userdel {{item}}
with_items: "{{users_to_remove | default([])}}"
when: manage_file_users
environment:
@ -60,7 +60,7 @@
- name: Add Users
become: yes
command: >
{{es_home}}/bin/{{es_xpack_users_command}} useradd {{item}} -p {{es_users.file[item].password}}
{{es_home}}/bin/elasticsearch-users useradd {{item}} -p {{es_users.file[item].password}}
with_items: "{{ users_to_add | default([]) }}"
when: manage_file_users
no_log: True
@ -73,7 +73,7 @@
- name: Set User Passwords
become: yes
command: >
{{es_home}}/bin/{{es_xpack_users_command}} passwd {{ item }} -p {{es_users.file[item].password}}
{{es_home}}/bin/elasticsearch-users passwd {{ item }} -p {{es_users.file[item].password}}
with_items: "{{ es_users.file.keys() | list }}"
when: manage_file_users
#Currently no easy way to figure out if the password has changed or to know what it currently is so we can skip.