diff options
| author | Michael Gugino <mgugino@redhat.com> | 2018-02-12 17:46:24 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2018-02-13 16:32:36 -0500 |
| commit | cdb1ae5fd0057aa6b666ca53fc54e73ce8be19fa (patch) | |
| tree | 272b8d3867998590b690af95d56297fbc2a2e348 /playbooks/common/openshift-cluster/upgrades/pre/config.yml | |
| parent | 864d3bd62d28ea2ac10eaef4b767ce3fc7189bba (diff) | |
| download | openshift-cdb1ae5fd0057aa6b666ca53fc54e73ce8be19fa.tar.gz openshift-cdb1ae5fd0057aa6b666ca53fc54e73ce8be19fa.tar.bz2 openshift-cdb1ae5fd0057aa6b666ca53fc54e73ce8be19fa.tar.xz openshift-cdb1ae5fd0057aa6b666ca53fc54e73ce8be19fa.zip | |
Simplify double upgrade version logic
Currently, double upgrade process (3.7 -> 3.9)
for control plane attempts to run openshift_version
role twice to set the appropriate values for
upgrading each major version, 3.8 and 3.9.
This commit instructs openshift_version to
only inquire about the proper settings for 3.9,
and hard-sets the appropriate values for 3.8.
This allows a simplification of the
openshift_version role, allowing for easier
debugging.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542368
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/pre/config.yml')
| -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 44af37b2d..4dcd4f61b 100644 --- a/playbooks/common/openshift-cluster/upgrades/pre/config.yml +++ b/playbooks/common/openshift-cluster/upgrades/pre/config.yml @@ -51,6 +51,10 @@ # l_openshift_version_set_hosts is passed via upgrade_control_plane.yml # l_openshift_version_check_hosts is passed via upgrade_control_plane.yml +# version_override will set various version-related variables during a double upgrade. +- import_playbook: version_override.yml + when: l_double_upgrade_cp | default(False) + - import_playbook: verify_cluster.yml # If we're only upgrading nodes, we need to ensure masters are already upgraded |