summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/handlers
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-03-28 14:38:33 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-03-29 09:52:01 -0400
commitcb0fc3000447b6305491fe24d28d4b8574e4acac (patch)
tree30bf65f1cfb6dacb943b774be864d4cede0f0d4d /roles/openshift_master/handlers
parentd4da502b9f332a6e4ec5a3b757dd8bf352990ec8 (diff)
downloadopenshift-cb0fc3000447b6305491fe24d28d4b8574e4acac.tar.gz
openshift-cb0fc3000447b6305491fe24d28d4b8574e4acac.tar.bz2
openshift-cb0fc3000447b6305491fe24d28d4b8574e4acac.tar.xz
openshift-cb0fc3000447b6305491fe24d28d4b8574e4acac.zip
Use openshift.master.ha instead of duplicating the logic
Diffstat (limited to 'roles/openshift_master/handlers')
-rw-r--r--roles/openshift_master/handlers/main.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_master/handlers/main.yml b/roles/openshift_master/handlers/main.yml
index e5b9e4977..70c7ef4e4 100644
--- a/roles/openshift_master/handlers/main.yml
+++ b/roles/openshift_master/handlers/main.yml
@@ -1,17 +1,17 @@
---
- 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))
+ when: (openshift.master.ha is defined and 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'
+ when: (openshift.master.ha is defined and 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'
+ when: (openshift.master.ha is defined and 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