Merge branch 'master' into es_repo_base

This commit is contained in:
Branen Salmon 2019-03-12 09:56:36 -04:00
commit 59de0102a8
No known key found for this signature in database
GPG key ID: 419F694FF72F2A72
12 changed files with 21 additions and 19 deletions

View file

@ -21,7 +21,7 @@
- name: Detect if es_version is before X-Pack was open and included
set_fact:
es_open_xpack: false
when: "es_version | version_compare('6.3.0', '<')"
when: "es_version is version_compare('6.3.0', '<')"
- name: If this is an older version we need to install X-Pack as a plugin and use a differet users command
set_fact:

View file

@ -15,6 +15,7 @@
register: elasticsearch_package
failed_when: False
changed_when: False
check_mode: no
- name: stop elasticsearch
service:

View file

@ -44,6 +44,7 @@
register: open_jdk
ignore_errors: yes
changed_when: false
check_mode: no
#https://github.com/docker-library/openjdk/issues/19 - ensures tests pass due to java 8 broken certs
- name: refresh the java ca-certificates

View file

@ -73,7 +73,7 @@
# If playbook runs too fast, Native commands could fail as the Native Realm is not yet up
- name: Wait 15 seconds for the Native Relm to come up
pause: seconds=15
command: sleep 15
when: manage_native_realm
- name: activate-license

View file

@ -20,4 +20,4 @@
- name: Set elasticsearch.keystore Permissions
become: yes
file: state=file path={{ conf_dir }}/elasticsearch.keystore owner={{ es_user }} group={{ es_group }}
when: es_enable_xpack and "security" in es_xpack_features and (es_version | version_compare('6.0.0', '>'))
when: es_enable_xpack and "security" in es_xpack_features and (es_version is version_compare('6.0.0', '>'))

View file

@ -14,7 +14,7 @@
#-----------------------------Create Bootstrap User-----------------------------------
### START BLOCK elasticsearch keystore ###
- name: create the elasticsearch keystore
when: (es_enable_xpack and "security" in es_xpack_features) and (es_version | version_compare('6.0.0', '>'))
when: (es_enable_xpack and "security" in es_xpack_features) and (es_version is version_compare('6.0.0', '>'))
block:
- name: create the keystore if it doesn't exist yet
become: yes