Reverting logic for verify api handler to be uniform with other ways we verify, will be uniformly updated in future

1 files changed, 15 insertions, 5 deletions

diff --git a/roles/openshift_logging/handlers/main.yml b/roles/openshift_logging/handlers/main.yml
index 2f83dd41b..ffb812271 100644
--- a/roles/openshift_logging/handlers/main.yml
+++ b/roles/openshift_logging/handlers/main.yml
@@ -5,12 +5,22 @@
   notify: Verify API Server
 
 - name: Verify API Server
-  uri:
-    url: "{{ openshift.master.api_url }}/healthz/ready"
-    return_content: yes
-    status_code: 200
+  # Using curl here since the uri module requires python-httplib2 and
+  # wait_for port doesn't provide health information.
+  command: >
+    curl --silent --tlsv1.2
+    {% if openshift.common.version_gte_3_2_or_1_2 | bool %}
+    --cacert {{ openshift.common.config_base }}/master/ca-bundle.crt
+    {% else %}
+    --cacert {{ openshift.common.config_base }}/master/ca.crt
+    {% endif %}
+    {{ openshift.master.api_url }}/healthz/ready
+  args:
+    # Disables the following warning:
+    # Consider using get_url or uri module rather than running curl
+    warn: no
   register: api_available_output
-  until: api_available_output | succeeded
+  until: api_available_output.stdout == 'ok'
   retries: 120
   delay: 1
   changed_when: false