Move excluder disablement into control plane and node upgrade playbooks

So that excluder is disabled and reset within the scope of each of those
in addition to the overall playbook

playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml

@@ -46,6 +46,10 @@
   tags:
   - pre_upgrade
 
+- include: ../../../../common/openshift-cluster/disable_excluder.yml
+  tags:
+  - pre_upgrade
+
 - include: ../../../../common/openshift-cluster/initialize_openshift_version.yml
   tags:
   - pre_upgrade

playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade_control_plane.yml

@@ -51,6 +51,10 @@
   tags:
   - pre_upgrade
 
+- include: ../../../../common/openshift-cluster/disable_excluder.yml
+  tags:
+  - pre_upgrade
+
 - include: ../../../../common/openshift-cluster/initialize_openshift_version.yml
   tags:
   - pre_upgrade

playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade_nodes.yml

@@ -47,6 +47,10 @@
   tags:
   - pre_upgrade
 
+- include: ../../../../common/openshift-cluster/disable_excluder.yml
+  tags:
+  - pre_upgrade
+
 - include: ../../../../common/openshift-cluster/initialize_openshift_version.yml
   tags:
   - pre_upgrade

playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml

@@ -46,6 +46,10 @@
   tags:
   - pre_upgrade
 
+- include: ../../../../common/openshift-cluster/disable_excluder.yml
+  tags:
+  - pre_upgrade
+
 - include: ../../../../common/openshift-cluster/initialize_openshift_version.yml
   tags:
   - pre_upgrade

playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade_control_plane.yml

@@ -51,6 +51,10 @@
   tags:
   - pre_upgrade
 
+- include: ../../../../common/openshift-cluster/disable_excluder.yml
+  tags:
+  - pre_upgrade
+
 - include: ../../../../common/openshift-cluster/initialize_openshift_version.yml
   tags:
   - pre_upgrade

playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade_nodes.yml

@@ -47,6 +47,10 @@
   tags:
   - pre_upgrade
 
+- include: ../disable_excluder.yml
+  tags:
+  - pre_upgrade
+
 - include: ../../../../common/openshift-cluster/initialize_openshift_version.yml
   tags:
   - pre_upgrade

playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade.yml

@@ -46,6 +46,10 @@
   tags:
   - pre_upgrade
 
+- include: ../../../../common/openshift-cluster/disable_excluder.yml
+  tags:
+  - pre_upgrade
+
 - include: ../../../../common/openshift-cluster/initialize_openshift_version.yml
   tags:
   - pre_upgrade

playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade_control_plane.yml

@@ -51,6 +51,10 @@
   tags:
   - pre_upgrade
 
+- include: ../../../../common/openshift-cluster/disable_excluder.yml
+  tags:
+  - pre_upgrade
+
 - include: ../../../../common/openshift-cluster/initialize_openshift_version.yml
   tags:
   - pre_upgrade

playbooks/byo/openshift-cluster/upgrades/v3_5/upgrade_nodes.yml

@@ -47,6 +47,10 @@
   tags:
   - pre_upgrade
 
+- include: ../../../../common/openshift-cluster/disable_excluder.yml
+  tags:
+  - pre_upgrade
+
 - include: ../../../../common/openshift-cluster/initialize_openshift_version.yml
   tags:
   - pre_upgrade

playbooks/common/openshift-cluster/upgrades/init.yml

@@ -55,8 +55,6 @@
 
 - include: ../initialize_facts.yml
 
-- include: ../disable_excluder.yml
-
 - name: Ensure clean repo cache in the event repos have been changed manually
   hosts: oo_all_hosts
   tags: