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

[xpack] use elasticsearch default xpack features (#560)

Browse source 
- Stop forcing es_xpack_features variable in order to let elasticsearch install default features described in http://localhost:9200/_xpack
- Change xpack test scope to be able to test default xpack install
  - xpack scenario will test xpack install with default features
  - xpack upgrade scenario will fully test security feature
  - oss-to-xpack-upgrade will test installing only other specific features
- Cleanup some duplicate serverspec tests
- Remove `system_key`feature (deprecated in 5.6 and removed in 6.0 - [Breaking Changes 6.0.0](https://www.elastic.co/guide/en/elasticsearch/reference/6.0/breaking-6.0.0-xes.html))
- Cleanup some ansible code (especially in `when` conditions)
This commit is contained in:
Julien Mailleret 2019-05-29 12:10:11 +02:00 • committed by GitHub
parent 5e99299637
commit a879b74def
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 70 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tasks/xpack/security/elasticsearch-xpack-activation.yml
View file

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