From 259272fa2359fd4d3bd78291bd0b06a1261c4b01 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Thu, 16 Nov 2017 15:49:17 -0500 Subject: Remove all references to pacemaker (pcs, pcsd) and openshift.master.cluster_method. With pacemaker removed there is no longer a need for openshift.master.cluster_method. We only have one option. --- roles/nuage_master/handlers/main.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'roles/nuage_master/handlers') diff --git a/roles/nuage_master/handlers/main.yaml b/roles/nuage_master/handlers/main.yaml index 410b739e9..cb83c8ead 100644 --- a/roles/nuage_master/handlers/main.yaml +++ b/roles/nuage_master/handlers/main.yaml @@ -3,8 +3,7 @@ systemd: name={{ openshift.common.service_type }}-master-api state=restarted when: > (openshift_master_ha | bool) and - (not master_api_service_status_changed | default(false)) and - openshift.master.cluster_method == 'native' + (not master_api_service_status_changed | default(false)) # TODO: need to fix up ignore_errors here # We retry the controllers because the API may not be 100% initialized yet. @@ -16,6 +15,5 @@ until: result.rc == 0 when: > (openshift_master_ha | bool) and - (not master_controllers_service_status_changed | default(false)) and - openshift.master.cluster_method == 'native' + (not master_controllers_service_status_changed | default(false)) ignore_errors: yes -- cgit v1.2.3