Merge branch 'feature-es-cluster-check-fix'

This commit is contained in:
neonmei 2020-11-09 15:26:24 -03:00
commit 75f1669ca8
No known key found for this signature in database
GPG Key ID: 7EA1832E7E17237E

View File

@ -5,11 +5,9 @@
- generate_certs - generate_certs
- block: - block:
- import_tasks: RedHat.yml - import_tasks: RedHat.yml
when: ansible_os_family == 'RedHat' when: ansible_os_family == 'RedHat'
- name: Install OpenDistro - name: Install OpenDistro
package: package:
name: opendistroforelasticsearch-{{ opendistro_version }} name: opendistroforelasticsearch-{{ opendistro_version }}
@ -67,13 +65,14 @@
return_content: yes return_content: yes
timeout: 4 timeout: 4
register: _result register: _result
until: ( _result.json is defined) and (_result.json.status == "green") until:
- _result.json is defined
- _result.json.status == "green" or ( _result.json.status == "yellow" and single_node )
retries: 24 retries: 24
delay: 5 delay: 5
tags: debug tags: debug
when: when:
- hostvars[inventory_hostname]['private_ip'] is not defined or not hostvars[inventory_hostname]['private_ip'] - hostvars[inventory_hostname]['private_ip'] is not defined or not hostvars[inventory_hostname]['private_ip']
- single_node == false
- name: Wait for Elasticsearch API (Private IP) - name: Wait for Elasticsearch API (Private IP)
uri: uri:
@ -85,15 +84,15 @@
return_content: yes return_content: yes
timeout: 4 timeout: 4
register: _result register: _result
until: ( _result.json is defined) and (_result.json.status == "green") until:
- _result.json is defined
- _result.json.status == "green" or ( _result.json.status == "yellow" and single_node )
retries: 24 retries: 24
delay: 5 delay: 5
tags: debug tags: debug
when: when:
- hostvars[inventory_hostname]['private_ip'] is defined and hostvars[inventory_hostname]['private_ip'] - hostvars[inventory_hostname]['private_ip'] is defined and hostvars[inventory_hostname]['private_ip']
- single_node == false
- import_tasks: "RMRedHat.yml" - import_tasks: "RMRedHat.yml"
when: ansible_os_family == "RedHat" when: ansible_os_family == "RedHat"
when: perform_installation when: perform_installation