Merge branch 'master' into master

This commit is contained in:
DJ Gill 2018-05-22 11:15:15 -07:00 committed by GitHub
commit 31ee9afad8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 18 deletions

View file

@ -19,7 +19,7 @@
when: es_use_repository
register: redhat_elasticsearch_install_from_repo
notify: restart elasticsearch
until: '"failed" not in redhat_elasticsearch_install_from_repo'
until: redhat_elasticsearch_install_from_repo.rc == 0
retries: 5
delay: 10

View file

@ -14,6 +14,7 @@
- name: Get the installed java path
shell: "update-alternatives --display java | grep '^/' | awk '{print $1}' | grep 1.8.0"
become: yes
register: java_full_path
failed_when: False
changed_when: False