Merge pull request #7338 from nak3/add-noproxy

Add no_proxy to verify to check .svc

roles/openshift_web_console/tasks/start.yml

@@ -1,13 +1,13 @@
 ---
 - name: Verify that the web console is running
-  command: >
-    curl -k https://webconsole.openshift-web-console.svc/healthz
-  args:
-    # Disables the following warning:
-    # Consider using get_url or uri module rather than running curl
-    warn: no
+  uri:
+    url: https://webconsole.openshift-web-console.svc/healthz
+    validate_certs: no
+    return_content: yes
+  environment:
+    no_proxy: '*'
   register: endpoint_health
-  until: endpoint_health.stdout == 'ok'
+  until: "'ok' in endpoint_health.content"
   retries: 60
   delay: 10
   changed_when: false
@@ -15,7 +15,7 @@
   ignore_errors: yes
 
 # Log the result of `oc status`, `oc get pods`, `oc get events`, and `oc logs deployment/webconsole` for troubleshooting failures.
-- when: endpoint_health.stdout != 'ok'
+- when: "'ok' not in endpoint_health.content"
   block:
   - name: Check status in the openshift-web-console namespace
     command: >
@@ -46,7 +46,7 @@
   - debug:
       msg: "{{ endpoint_log.stdout_lines }}"
 
-- when: endpoint_health.stdout != 'ok'
+- when: "'ok' not in endpoint_health.content"
   block:
   - name: Report console errors
     fail:

roles/template_service_broker/tasks/deploy.yml

@@ -50,14 +50,14 @@
 
 # Check that the TSB is running
 - name: Verify that TSB is running
-  command: >
-    curl -k https://apiserver.openshift-template-service-broker.svc/healthz
-  args:
-    # Disables the following warning:
-    # Consider using get_url or uri module rather than running curl
-    warn: no
+  uri:
+    url: https://apiserver.openshift-template-service-broker.svc/healthz
+    validate_certs: no
+    return_content: yes
+  environment:
+    no_proxy: '*'
   register: api_health
-  until: api_health.stdout == 'ok'
+  until: "'ok' in api_health.content"
   retries: 60
   delay: 10
   changed_when: false