diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-10 04:25:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 04:25:27 -0800 |
| commit | aa155550a651708fcb200746ad78fb0bbf562e94 (patch) | |
| tree | da835826b14c46cfa949d85faab2cf0ae1675458 /playbooks/common/openshift-cluster/upgrades/pre | |
| parent | 3625cb596bfdeba027e9e3ed364b2102899edfcd (diff) | |
| parent | a3e80f646abacc76267abf4df73bde870909aa11 (diff) | |
| download | openshift-aa155550a651708fcb200746ad78fb0bbf562e94.tar.gz openshift-aa155550a651708fcb200746ad78fb0bbf562e94.tar.bz2 openshift-aa155550a651708fcb200746ad78fb0bbf562e94.tar.xz openshift-aa155550a651708fcb200746ad78fb0bbf562e94.zip | |
Merge pull request #6671 from mgugino-upstream-stage/upgrade-cp-scope
Automatic merge from submit-queue.
Limit host group scope on control-plane upgrades
This commit limits common init code to exclude
oo_nodes_to_config during upgrade_control_plane runs.
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/pre')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/pre/config.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/config.yml b/playbooks/common/openshift-cluster/upgrades/pre/config.yml index cfc0c8745..da63450b8 100644 --- a/playbooks/common/openshift-cluster/upgrades/pre/config.yml +++ b/playbooks/common/openshift-cluster/upgrades/pre/config.yml @@ -1,4 +1,6 @@ --- +# for control-plane upgrade, several variables may be passed in to this play +# why may affect the tasks here and in imported playbooks. # Pre-upgrade - import_playbook: ../initialize_nodes_to_upgrade.yml @@ -48,6 +50,8 @@ # defined, and overriding the normal behavior of protecting the installed version openshift_release: "{{ openshift_upgrade_target }}" openshift_protect_installed_version: False + # l_openshift_version_set_hosts is passed via upgrade_control_plane.yml + # l_openshift_version_check_hosts is passed via upgrade_control_plane.yml # If we're only upgrading nodes, we need to ensure masters are already upgraded - name: Verify masters are already upgraded |