Add excluder management to upgrade and config playbooks

playbooks/common/openshift-cluster/config.yml

@@ -26,6 +26,10 @@
       openshift_docker_selinux_enabled: "{{ lookup('oo_option', 'docker_selinux_enabled') }}"
     when: openshift_docker_selinux_enabled is not defined
 
+- include: disable_excluder.yml
+  tags:
+  - always
+
 - include: ../openshift-etcd/config.yml
   tags:
   - etcd

playbooks/common/openshift-cluster/disable_excluder.yml

@@ -0,0 +1,11 @@
+---
+- name: Record excluder state and disable
+  hosts: l_oo_all_hosts
+  gather_facts: no
+  tasks:
+  - include_role:
+      name: openshift_excluder
+      tasks_from: status
+  - include_role:
+      name: openshift_excluder
+      tasks_from: unexclude

playbooks/common/openshift-cluster/reset_excluder.yml

@@ -0,0 +1,8 @@
+---
+- name: Re-enable excluder if it was previously enabled
+  hosts: l_oo_all_hosts
+  gather_facts: no
+  tasks:
+  - include_role:
+      name: openshift_excluder
+      tasks_from: reset

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

@@ -55,6 +55,8 @@
 
 - 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:

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

@@ -74,3 +74,7 @@
   - name: Warn if pluginOrderOverride is in use in master-config.yaml
     debug: msg="WARNING pluginOrderOverride is being deprecated in master-config.yaml, please see https://docs.openshift.com/enterprise/latest/architecture/additional_concepts/admission_controllers.html for more information."
     when: not grep_plugin_order_override | skipped and grep_plugin_order_override.rc == 0
+
+- include: ../reset_excluder.yml
+  tags:
+  - always

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

@@ -51,3 +51,7 @@
     until: node_sched.rc == 0
     retries: 3
     delay: 1
+
+- include: ../reset_excluder.yml
+  tags:
+  - always