|
@@ -96,7 +96,7 @@
|
|
|
state: list
|
|
|
kind: pod
|
|
|
namespace: kube-system
|
|
|
- kubeconfig: /opt/tectonic/auth/kubeconfig
|
|
|
+ kubeconfig: /opt/openshift/auth/kubeconfig
|
|
|
register: control_plane_pods
|
|
|
retries: 60
|
|
|
delay: 10
|
|
@@ -108,7 +108,7 @@
|
|
|
state: list
|
|
|
kind: node
|
|
|
selector: "node-role.kubernetes.io/master"
|
|
|
- kubeconfig: /opt/tectonic/auth/kubeconfig
|
|
|
+ kubeconfig: /opt/openshift/auth/kubeconfig
|
|
|
register: master_nodes
|
|
|
retries: 60
|
|
|
delay: 10
|
|
@@ -124,38 +124,6 @@
|
|
|
ignore_errors: true
|
|
|
- name: Fetch kubeconfig for test container
|
|
|
fetch:
|
|
|
- src: /opt/tectonic/auth/kubeconfig
|
|
|
+ src: /opt/openshift/auth/kubeconfig
|
|
|
dest: /tmp/artifacts/installer/auth/kubeconfig
|
|
|
flat: yes
|
|
|
-
|
|
|
- - name: Wait for router namespace to appear
|
|
|
- oc_obj:
|
|
|
- state: list
|
|
|
- kind: namespace
|
|
|
- name: openshift-ingress
|
|
|
- kubeconfig: /opt/tectonic/auth/kubeconfig
|
|
|
- register: ingress_namespace
|
|
|
- retries: 60
|
|
|
- delay: 10
|
|
|
- until:
|
|
|
- - "'results' in ingress_namespace"
|
|
|
- - "'results' in ingress_namespace.results"
|
|
|
- - ingress_namespace.results.results | length > 0
|
|
|
-
|
|
|
- - name: Wait for router pods to be ready
|
|
|
- oc_obj:
|
|
|
- state: list
|
|
|
- kind: deployment
|
|
|
- name: router-default
|
|
|
- namespace: openshift-ingress
|
|
|
- kubeconfig: /opt/tectonic/auth/kubeconfig
|
|
|
- register: ingress_ds
|
|
|
- retries: 60
|
|
|
- delay: 10
|
|
|
- until:
|
|
|
- - "'results' in ingress_ds"
|
|
|
- - "'results' in ingress_ds.results"
|
|
|
- - ingress_ds.results.results | length > 0
|
|
|
- - "'status' in ingress_ds.results.results[0]"
|
|
|
- - "'readyReplicas' in ingress_ds.results.results[0]['status']"
|
|
|
- - ingress_ds.results.results[0]['status']['replicas'] == ingress_ds.results.results[0]['status']['readyReplicas']
|