diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-03-08 10:14:19 -0500 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-03-08 12:13:05 -0500 |
| commit | eb4bbf0f3e5bdf5259ea1674c2c84a9ce83ede69 (patch) | |
| tree | dccafde89ab97c66f414f870a8ed43675900495d /roles | |
| parent | 440875336eb0df1c05056aeec8dc2ee0032a74d8 (diff) | |
| download | openshift-eb4bbf0f3e5bdf5259ea1674c2c84a9ce83ede69.tar.gz openshift-eb4bbf0f3e5bdf5259ea1674c2c84a9ce83ede69.tar.bz2 openshift-eb4bbf0f3e5bdf5259ea1674c2c84a9ce83ede69.tar.xz openshift-eb4bbf0f3e5bdf5259ea1674c2c84a9ce83ede69.zip | |
Use /healthz/ready when verifying api
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 4f722679d..0e29e6854 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -277,9 +277,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 b87c2aa21..b9887b68b 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 |