Merge branch 'master' into become-yes

This commit is contained in:
Brad Pitcher 2017-09-19 14:22:02 -06:00
commit 891d87c019
No known key found for this signature in database
GPG key ID: 9985F03D4EE0AA12
52 changed files with 624 additions and 195 deletions

View file

@ -18,6 +18,7 @@
yum: name=elasticsearch{% if es_version is defined and es_version != "" %}-{{ es_version }}{% endif %} state=present update_cache=yes
when: es_use_repository
register: redhat_elasticsearch_install_from_repo
notify: restart elasticsearch
until: '"failed" not in redhat_elasticsearch_install_from_repo'
retries: 5
delay: 10
@ -27,3 +28,4 @@
yum: name={% if es_custom_package_url is defined %}{{ es_custom_package_url }}{% else %}{{ es_package_url }}-{{ es_version }}.noarch.rpm{% endif %} state=present
when: not es_use_repository
register: elasticsearch_install_from_package
notify: restart elasticsearch