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

xpack features refactoring (#653)

Browse source 
- rename es_enable_xpack variable to oss_version
  this variable name should be more explicit and consistent with the xpack changes made in 6.3
  es_enable_xpack can still be used but is deprecated and will be removed in a later version.
- remove es_xpack-features variables
  this variable was not working anymore since 6.3 [0]

[0]: https://github.com/elastic/ansible-elasticsearch/issues/608
This commit is contained in:
Julien Mailleret 2020-06-12 18:15:03 +02:00 • committed by GitHub
parent c12542836e
commit cab03ece10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 31 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tasks/main.yml
View file

@ -78,7 +78,7 @@
set_fact: manage_native_realm=true
when:
- es_start_service
- es_enable_xpack
- not oss_version
- (es_users is defined and es_users.native is defined) or (es_roles is defined and es_roles.native is defined)
# If playbook runs too fast, Native commands could fail as the Native Realm is not yet up
@ -88,11 +88,11 @@
- name: activate-license
include: ./xpack/security/elasticsearch-xpack-activation.yml
when: es_start_service and es_enable_xpack and es_xpack_license is defined and es_xpack_license != ''
when: es_start_service and not oss_version and es_xpack_license is defined and es_xpack_license != ''
- name: activate-trial
include: ./xpack/security/elasticsearch-xpack-trial-activation.yml
when: es_start_service and es_enable_xpack and es_xpack_trial
when: es_start_service and not oss_version and es_xpack_trial
#perform security actions here now elasticsearch is started
- name: include xpack/security/elasticsearch-security-native.yml