afmarulanda/wazuh-ansible-4.8.1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor test conditions

Browse Source
This commit is contained in:
zenidd 2020-11-09 17:57:12 +01:00
parent bda7de57ec
commit d23feddede
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/opendistro/opendistro-elasticsearch/tasks/main.yml
View File

@ -64,13 +64,12 @@
return_content: yes return_content: yes
timeout: 4 timeout: 4
register: _result register: _result
until: ( _result.json is defined) and (_result.json.status == "green" or _result.json.status == "yellow" ) until: ( _result.json is defined) and (_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:
@ -82,13 +81,12 @@
return_content: yes return_content: yes
timeout: 4 timeout: 4
register: _result register: _result
until: ( _result.json is defined) and (_result.json.status == "green" or _result.json.status == "yellow" ) until: ( _result.json is defined) and (_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"