diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-08 14:57:27 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-08 14:57:27 -0500 |
| commit | ab01034ee6c0f14ec35be315918f5073d3a584bf (patch) | |
| tree | 996875d291be017aa55289bc436d45fca55a0011 /roles | |
| parent | 74026a867051d6909db02bab4140d663b26b7968 (diff) | |
| parent | eb4bbf0f3e5bdf5259ea1674c2c84a9ce83ede69 (diff) | |
| download | openshift-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')
| -rw-r--r-- | roles/openshift_master/handlers/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 4 |
3 files changed, 6 insertions, 6 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 diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index e250afe09..2d3960cd8 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -124,9 +124,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_node_master_api_url }} + curl -k --silent {{ openshift_node_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 |