diff options
author | Matt Woodson <mwoodson@gmail.com> | 2016-01-18 15:08:03 -0500 |
---|---|---|
committer | Matt Woodson <mwoodson@gmail.com> | 2016-01-18 15:08:03 -0500 |
commit | 3bed4d0c4bda1b6332ec547502663d09e98b89d1 (patch) | |
tree | f64e0d0c7e9bc06a76d727050047053cf1a30a6a /roles/openshift_master/handlers | |
parent | 0bbfef4e1951db1f19135e532f78fe12cab6d4fc (diff) | |
parent | ee3aec770b6b1a2b0212b432a920e3d846e56044 (diff) | |
download | openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.tar.gz openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.tar.bz2 openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.tar.xz openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.zip |
Merge pull request #1214 from openshift/master
Merge master into prod
Diffstat (limited to 'roles/openshift_master/handlers')
-rw-r--r-- | roles/openshift_master/handlers/main.yml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/roles/openshift_master/handlers/main.yml b/roles/openshift_master/handlers/main.yml index e1b95eda4..6b9992eea 100644 --- a/roles/openshift_master/handlers/main.yml +++ b/roles/openshift_master/handlers/main.yml @@ -2,11 +2,24 @@ - name: restart master service: name={{ openshift.common.service_type }}-master state=restarted when: (not openshift_master_ha | bool) and (not (master_service_status_changed | default(false) | bool)) + notify: Verify API Server - name: restart master api service: name={{ openshift.common.service_type }}-master-api state=restarted when: (openshift_master_ha | bool) and (not (master_api_service_status_changed | default(false) | bool)) and openshift.master.cluster_method == 'native' + notify: Verify API Server - name: restart master controllers service: name={{ openshift.common.service_type }}-master-controllers state=restarted when: (openshift_master_ha | bool) and (not (master_controllers_service_status_changed | default(false) | bool)) and openshift.master.cluster_method == 'native' + +- name: Verify API Server + # 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 }} + register: api_available_output + until: api_available_output.stdout.find("200 OK") != -1 + retries: 120 + delay: 1 + changed_when: false |