From 4f7d963986a1e28ecc6abd15532b0c1aece99be1 Mon Sep 17 00:00:00 2001 From: Michael Gugino Date: Thu, 25 Jan 2018 13:25:49 -0500 Subject: Remove master_ha bool checks Most of these checks are no longer applicable to the tasks on which they are applied. This commit removes incorrect ha checks to ensure services are restarted at appropriate times. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1500897 --- playbooks/openshift-master/private/restart.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'playbooks/openshift-master/private/restart.yml') diff --git a/playbooks/openshift-master/private/restart.yml b/playbooks/openshift-master/private/restart.yml index 5cb284935..17d90533c 100644 --- a/playbooks/openshift-master/private/restart.yml +++ b/playbooks/openshift-master/private/restart.yml @@ -3,16 +3,13 @@ - name: Restart masters hosts: oo_masters_to_config - vars: - openshift_master_ha: "{{ groups.oo_masters_to_config | length > 1 }}" serial: 1 - handlers: - - import_tasks: ../../../roles/openshift_master/handlers/main.yml roles: - openshift_facts post_tasks: - include_tasks: tasks/restart_hosts.yml when: openshift_rolling_restart_mode | default('services') == 'system' - - - include_tasks: tasks/restart_services.yml + - import_role: + name: openshift_master + tasks_from: restart.yml when: openshift_rolling_restart_mode | default('services') == 'services' -- cgit v1.2.3