From 1b0556f73f6cac0ee799f5746248d3c51fd8ce9f Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Fri, 28 Apr 2017 15:41:00 +0200 Subject: move excluder upgrade validation tasks under openshift_excluder role --- .../common/openshift-cluster/upgrades/disable_excluder.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'playbooks/common/openshift-cluster/upgrades/disable_excluder.yml') diff --git a/playbooks/common/openshift-cluster/upgrades/disable_excluder.yml b/playbooks/common/openshift-cluster/upgrades/disable_excluder.yml index a30952929..02042c1ef 100644 --- a/playbooks/common/openshift-cluster/upgrades/disable_excluder.yml +++ b/playbooks/common/openshift-cluster/upgrades/disable_excluder.yml @@ -3,15 +3,10 @@ hosts: oo_masters_to_config:oo_nodes_to_config gather_facts: no tasks: - - include: pre/validate_excluder.yml - vars: - excluder: "{{ openshift.common.service_type }}-docker-excluder" - when: enable_docker_excluder | default(enable_excluders) | default(True) | bool - - include: pre/validate_excluder.yml - vars: - excluder: "{{ openshift.common.service_type }}-excluder" - when: enable_openshift_excluder | default(enable_excluders) | default(True) | bool - + # verify the excluders can be upgraded + - include_role: + name: openshift_excluder + tasks_from: verify_upgrade # disable excluders based on their status - include_role: -- cgit v1.2.3