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 /roles/openshift_node/tasks | |
| 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 'roles/openshift_node/tasks')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index b87c2aa21..2d3960cd8 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -47,12 +47,12 @@ - name: Pull node image command: > - docker pull {{ openshift.node.node_image }} + docker pull {{ openshift.node.node_image }}:{{ openshift_version }} when: openshift.common.is_containerized | bool - name: Pull OpenVSwitch image command: > - docker pull {{ openshift.node.ovs_image }} + docker pull {{ openshift.node.ovs_image }}:{{ openshift_version }} when: openshift.common.is_containerized | bool and openshift.common.use_openshift_sdn | bool - name: Install Node docker service file @@ -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 |