1 files changed, 4 insertions, 9 deletions
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: