diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-02-06 14:22:23 -0500 |
---|---|---|
committer | Scott Dodson <sdodson@redhat.com> | 2017-02-06 14:23:49 -0500 |
commit | e27514ac435b13c7c507c0fcd73c1135547d37ca (patch) | |
tree | 25d0e49c91cee22f3b8ea31a94fd5b754ecf43f4 /playbooks/byo/openshift-cluster/upgrades/v3_4 | |
parent | 4aebe739fb18fc150c00e6fdacfabee909fbbb24 (diff) | |
download | openshift-e27514ac435b13c7c507c0fcd73c1135547d37ca.tar.gz openshift-e27514ac435b13c7c507c0fcd73c1135547d37ca.tar.bz2 openshift-e27514ac435b13c7c507c0fcd73c1135547d37ca.tar.xz openshift-e27514ac435b13c7c507c0fcd73c1135547d37ca.zip |
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
Diffstat (limited to 'playbooks/byo/openshift-cluster/upgrades/v3_4')
3 files changed, 12 insertions, 0 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml index 6b69348b7..82a1d0935 100644 --- a/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml +++ b/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 diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade_control_plane.yml b/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade_control_plane.yml index 25b669f86..d1c2bd17a 100644 --- a/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade_control_plane.yml +++ b/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 diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade_nodes.yml b/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade_nodes.yml index 9868cb5b4..f6e66c477 100644 --- a/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade_nodes.yml +++ b/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 |