diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-05-12 12:05:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-12 12:05:10 +0200 |
| commit | 52c19f7eeffe9dc8b480f6645564be5f1dffe677 (patch) | |
| tree | b1e7425beaecc8d7508cec97446b47dda988f89c /playbooks/common/openshift-cluster/upgrades/v3_6 | |
| parent | 593ef653c0d17876b871a221587a472cb0235c97 (diff) | |
| parent | ba67bf5e155b81d5f313f6e8492ffd5d3b583286 (diff) | |
| download | openshift-52c19f7eeffe9dc8b480f6645564be5f1dffe677.tar.gz openshift-52c19f7eeffe9dc8b480f6645564be5f1dffe677.tar.bz2 openshift-52c19f7eeffe9dc8b480f6645564be5f1dffe677.tar.xz openshift-52c19f7eeffe9dc8b480f6645564be5f1dffe677.zip | |
Merge pull request #3879 from ingvagabund/run-excluders-on-selected-hosts-only
run excluders over selected set of hosts during control_plane/node upgrade
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/v3_6')
3 files changed, 7 insertions, 5 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml index 4604bdc8b..a1b1f3301 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml @@ -46,12 +46,14 @@ tags: - pre_upgrade -- include: ../disable_excluder.yml +- include: ../disable_master_excluders.yml + tags: + - pre_upgrade + +- include: ../disable_node_excluders.yml tags: - pre_upgrade -# Note: During upgrade the openshift excluder is not unexcluded inside the initialize_openshift_version.yml play. -# So it is necassary to run the play after running disable_excluder.yml. - include: ../../initialize_openshift_version.yml tags: - pre_upgrade diff --git a/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_control_plane.yml index a09097ed9..af6e1f71b 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_control_plane.yml @@ -54,7 +54,7 @@ tags: - pre_upgrade -- include: ../disable_excluder.yml +- include: ../disable_master_excluders.yml tags: - pre_upgrade diff --git a/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_nodes.yml index 7640f2116..285c18b7b 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_nodes.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_nodes.yml @@ -47,7 +47,7 @@ tags: - pre_upgrade -- include: ../disable_excluder.yml +- include: ../disable_node_excluders.yml tags: - pre_upgrade |