Merge pull request #10090 from sdodson/retry-svc-discovery

Add retries around api service discovery

roles/openshift_control_plane/tasks/check_master_api_is_ready.yml

@@ -30,12 +30,15 @@
     {{ openshift_client_binary }} get apiservices/v1beta1.metrics.k8s.io
   register: metrics_service_registration
   failed_when: metrics_service_registration.rc != 0 and 'NotFound' not in metrics_service_registration.stderr
+  retries: 30
+  delay: 5
+  until: metrics_service_registration is succeeded
 
 - name: Wait for /apis/metrics.k8s.io/v1beta1 when registered
   command: >
     {{ openshift_client_binary }} get --raw /apis/metrics.k8s.io/v1beta1
   register: metrics_api
-  until: metrics_api.rc == 0
+  until: metrics_api is succeeded
   retries: 30
   delay: 5
   when: metrics_service_registration.rc == 0
@@ -45,12 +48,16 @@
     {{ openshift_client_binary }} get apiservices/v1beta1.servicecatalog.k8s.io
   register: servicecatalog_service_registration
   failed_when: servicecatalog_service_registration.rc != 0 and 'NotFound' not in servicecatalog_service_registration.stderr
+  retries: 30
+  delay: 5
+  until: metrics_service_registration is succeeded
+
 
 - name: Wait for /apis/servicecatalog.k8s.io/v1beta1 when registered
   command: >
     {{ openshift_client_binary }} get --raw /apis/servicecatalog.k8s.io/v1beta1
   register: servicecatalog_api
-  until: servicecatalog_api.rc == 0
+  until: servicecatalog_api is succeeded
   retries: 30
   delay: 5
   when: servicecatalog_service_registration.rc == 0