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

roles/opendistro/opendistro-elasticsearch/tasks/main.yml

@@ -5,11 +5,9 @@
     - generate_certs
 
 - block:
-
     - import_tasks: RedHat.yml
       when: ansible_os_family == 'RedHat'
 
-
     - name: Install OpenDistro
       package:
         name: opendistroforelasticsearch-{{ opendistro_version }}
@@ -67,13 +65,14 @@
         return_content: yes
         timeout: 4
       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
       delay: 5
       tags: debug
       when:
         - 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)
       uri:
@@ -85,15 +84,15 @@
         return_content: yes
         timeout: 4
       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
       delay: 5
       tags: debug
       when:
         - hostvars[inventory_hostname]['private_ip'] is defined and hostvars[inventory_hostname]['private_ip']
-      - single_node == false
 
     - import_tasks: "RMRedHat.yml"
       when: ansible_os_family == "RedHat"
-
   when: perform_installation