summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-03-08 14:57:27 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-03-08 14:57:27 -0500
commitab01034ee6c0f14ec35be315918f5073d3a584bf (patch)
tree996875d291be017aa55289bc436d45fca55a0011 /roles/openshift_master
parent74026a867051d6909db02bab4140d663b26b7968 (diff)
parenteb4bbf0f3e5bdf5259ea1674c2c84a9ce83ede69 (diff)
downloadopenshift-ab01034ee6c0f14ec35be315918f5073d3a584bf.tar.gz
openshift-ab01034ee6c0f14ec35be315918f5073d3a584bf.tar.bz2
openshift-ab01034ee6c0f14ec35be315918f5073d3a584bf.tar.xz
openshift-ab01034ee6c0f14ec35be315918f5073d3a584bf.zip
Merge branch 'wait-all-the-time' of https://github.com/abutcher/openshift-ansible
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/handlers/main.yml4
-rw-r--r--roles/openshift_master/tasks/main.yml4
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_master/handlers/main.yml b/roles/openshift_master/handlers/main.yml
index 6b9992eea..4d1216aae 100644
--- a/roles/openshift_master/handlers/main.yml
+++ b/roles/openshift_master/handlers/main.yml
@@ -17,9 +17,9 @@
# Using curl here since the uri module requires python-httplib2 and
# wait_for port doesn't provide health information.
command: >
- curl -k --head --silent {{ openshift.master.api_url }}
+ curl -k --silent {{ openshift.master.api_url }}/healthz/ready
register: api_available_output
- until: api_available_output.stdout.find("200 OK") != -1
+ until: api_available_output.stdout == 'ok'
retries: 120
delay: 1
changed_when: false
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 15b3c320c..759cda7d0 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -282,9 +282,9 @@
# Using curl here since the uri module requires python-httplib2 and
# wait_for port doesn't provide health information.
command: >
- curl -k --head --silent {{ openshift.master.api_url }}
+ curl -k --silent {{ openshift.master.api_url }}/healthz/ready
register: api_available_output
- until: api_available_output.stdout.find("200 OK") != -1
+ until: api_available_output.stdout == 'ok'
retries: 120
delay: 1
changed_when: false