summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/handlers
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-08-17 00:09:55 -0400
committerGitHub <noreply@github.com>2017-08-17 00:09:55 -0400
commit22fc8d8c9df7e5d72b9f60218022ca059db309be (patch)
treedd16cba51c466fb36ad29123afdbdcb5dc477168 /roles/openshift_master/handlers
parenta61da58f73c9cc3b3d4bff284752d9385f15fc32 (diff)
parent13c0075279d3cb8396743f096b05ccd721102903 (diff)
downloadopenshift-22fc8d8c9df7e5d72b9f60218022ca059db309be.tar.gz
openshift-22fc8d8c9df7e5d72b9f60218022ca059db309be.tar.bz2
openshift-22fc8d8c9df7e5d72b9f60218022ca059db309be.tar.xz
openshift-22fc8d8c9df7e5d72b9f60218022ca059db309be.zip
Merge pull request #4947 from ingvagabund/polish-openshift-master-role
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_master/handlers')
-rw-r--r--roles/openshift_master/handlers/main.yml23
1 files changed, 16 insertions, 7 deletions
diff --git a/roles/openshift_master/handlers/main.yml b/roles/openshift_master/handlers/main.yml
index ce7688581..d5094c2c9 100644
--- a/roles/openshift_master/handlers/main.yml
+++ b/roles/openshift_master/handlers/main.yml
@@ -1,12 +1,21 @@
---
- name: restart master api
- systemd: name={{ openshift.common.service_type }}-master-api state=restarted
- when: (not (master_api_service_status_changed | default(false) | bool)) and openshift.master.cluster_method == 'native'
- notify: Verify API Server
+ systemd:
+ name: "{{ openshift.common.service_type }}-master-api"
+ state: restarted
+ when:
+ - not (master_api_service_status_changed | default(false) | bool)
+ - openshift.master.cluster_method == 'native'
+ notify:
+ - Verify API Server
- name: restart master controllers
- systemd: name={{ openshift.common.service_type }}-master-controllers state=restarted
- when: (not (master_controllers_service_status_changed | default(false) | bool)) and openshift.master.cluster_method == 'native'
+ systemd:
+ name: "{{ openshift.common.service_type }}-master-controllers"
+ state: restarted
+ when:
+ - not (master_controllers_service_status_changed | default(false) | bool)
+ - openshift.master.cluster_method == 'native'
- name: Verify API Server
# Using curl here since the uri module requires python-httplib2 and
@@ -23,8 +32,8 @@
# Disables the following warning:
# Consider using get_url or uri module rather than running curl
warn: no
- register: api_available_output
- until: api_available_output.stdout == 'ok'
+ register: l_api_available_output
+ until: l_api_available_output.stdout == 'ok'
retries: 120
delay: 1
changed_when: false