diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-08 16:40:41 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-08 16:40:41 -0500 |
| commit | 72fbab29392f7b4697a440f406d6873941086d7d (patch) | |
| tree | 796eb0ae34a2ff5ac7c7691bc57a71272d61d0bd /playbooks | |
| parent | 8eabdf65278fbdbaf9ca264508937efcf81e6e44 (diff) | |
| parent | ab01034ee6c0f14ec35be315918f5073d3a584bf (diff) | |
| download | openshift-72fbab29392f7b4697a440f406d6873941086d7d.tar.gz openshift-72fbab29392f7b4697a440f406d6873941086d7d.tar.bz2 openshift-72fbab29392f7b4697a440f406d6873941086d7d.tar.xz openshift-72fbab29392f7b4697a440f406d6873941086d7d.zip | |
Merge pull request #1569 from brenton/master
reverting back to pre-pulling the master image
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-master/scaleup.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/common/openshift-master/scaleup.yml b/playbooks/common/openshift-master/scaleup.yml index 6f8151d30..ccb1d23f1 100644 --- a/playbooks/common/openshift-master/scaleup.yml +++ b/playbooks/common/openshift-master/scaleup.yml @@ -33,9 +33,9 @@ service: name={{ openshift.common.service_type }}-master-controllers state=restarted - name: verify api server 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/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index 7edea9160..c62167bd3 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/playbooks/common/openshift-node/config.yml @@ -258,9 +258,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 |