From 4aebe739fb18fc150c00e6fdacfabee909fbbb24 Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Mon, 6 Feb 2017 13:36:11 -0500
Subject: Add excluder management to upgrade and config playbooks
---
playbooks/common/openshift-cluster/upgrades/init.yml | 2 ++
playbooks/common/openshift-cluster/upgrades/post_control_plane.yml | 4 ++++
playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml | 4 ++++
3 files changed, 10 insertions(+)
(limited to 'playbooks/common/openshift-cluster/upgrades')
diff --git a/playbooks/common/openshift-cluster/upgrades/init.yml b/playbooks/common/openshift-cluster/upgrades/init.yml
index a3b8c489e..d2c8b1d20 100644
--- a/playbooks/common/openshift-cluster/upgrades/init.yml
+++ b/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:
diff --git a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
index 2bbcbe1f8..9f700423b 100644
--- a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
+++ b/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
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml
index 59188c570..e45b635f7 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml
+++ b/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
--
cgit v1.2.3