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_master | |
| 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_master')
| -rw-r--r-- | roles/openshift_master/handlers/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 9 |
2 files changed, 9 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 4f722679d..759cda7d0 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -92,6 +92,11 @@ action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-master{{ openshift_version }} state=present" when: not openshift.common.is_containerized | bool +- name: Pull master image + command: > + docker pull {{ openshift.master.master_image }}:{{ openshift_version }} + when: openshift.common.is_containerized | bool + - name: Install Master docker service file template: dest: "/etc/systemd/system/{{ openshift.common.service_type }}-master.service" @@ -277,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 |