[xpack] use elasticsearch default xpack features (#560)
- 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:
parent
5e99299637
commit
a879b74def
19 changed files with 70 additions and 92 deletions
|
|
@ -35,26 +35,8 @@ action.auto_create_index: false
|
|||
action.auto_create_index: {{ es_action_auto_create_index }}
|
||||
{% endif %}
|
||||
|
||||
{% if es_enable_xpack %}
|
||||
{% if not "security" in es_xpack_features %}
|
||||
xpack.security.enabled: false
|
||||
{% endif %}
|
||||
|
||||
{% if not "monitoring" in es_xpack_features %}
|
||||
xpack.monitoring.enabled: false
|
||||
{% endif %}
|
||||
|
||||
{% if not "alerting" in es_xpack_features %}
|
||||
xpack.watcher.enabled: false
|
||||
{% endif %}
|
||||
|
||||
{% if not "ml" in es_xpack_features %}
|
||||
xpack.ml.enabled: false
|
||||
{% endif %}
|
||||
|
||||
{% if not "graph" in es_xpack_features %}
|
||||
xpack.graph.enabled: false
|
||||
{% endif %}
|
||||
{% if es_enable_xpack and es_api_basic_auth_username is defined and es_api_basic_auth_password is defined %}
|
||||
xpack.security.enabled: true
|
||||
{% endif %}
|
||||
|
||||
{% if es_mail_config is defined %}
|
||||
|
|
@ -71,5 +53,5 @@ xpack.notification.email:
|
|||
{% if es_mail_config['require_auth'] == true %}
|
||||
user: {{ es_mail_config['user'] }}
|
||||
password: {{ es_mail_config['pass'] }}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue