Merge pull request #7283 from vrutkovs/3.7-service-catalog-no-proxy

[3.7] service catalog: Update API healthz check to use uri module and add noproxy

roles/openshift_service_catalog/tasks/start_api_server.yml

@@ -9,14 +9,14 @@
 
 # wait to see that the apiserver is available
 - name: wait for api server to be ready
-  command: >
-    curl -k https://apiserver.kube-service-catalog.svc/healthz
-  args:
-    # Disables the following warning:
-    # Consider using get_url or uri module rather than running curl
-    warn: no
+  uri:
+    url: https://apiserver.kube-service-catalog.svc/healthz
+    validate_certs: no
+    return_content: yes
+  environment:
+    no_proxy: '*'
   register: api_health
-  until: api_health.stdout == 'ok'
-  retries: 120
-  delay: 1
+  until: "'ok' in api_health.content"
+  retries: 60
+  delay: 5
   changed_when: false