diff options
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
3 files changed, 71 insertions, 37 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/config.yml b/playbooks/common/openshift-cluster/upgrades/pre/config.yml index c027fc8f5..7bf1496cb 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 diff --git a/playbooks/common/openshift-cluster/upgrades/pre/version_override.yml b/playbooks/common/openshift-cluster/upgrades/pre/version_override.yml new file mode 100644 index 000000000..b2954397f --- /dev/null +++ b/playbooks/common/openshift-cluster/upgrades/pre/version_override.yml @@ -0,0 +1,29 @@ +--- +# This playbook overrides normal version setting during double upgrades. + +- name: Set proper version values for upgrade + hosts: "{{ l_version_override_hosts | default('all:!all') }}" + tasks: + - set_fact: + # All of these will either have been set by openshift_version or + # provided by the user; we need to save these for later. + l_double_upgrade_saved_version: "{{ openshift_version }}" + l_double_upgrade_saved_release: "{{ openshift_release | default(openshift_upgrade_target) }}" + l_double_upgrade_saved_tag: "{{ openshift_image_tag }}" + l_double_upgrade_saved_pkgv: "{{ openshift_pkg_version }}" + - set_fact: + # We already ran openshift_version for the second of two upgrades; + # here we need to set some variables to enable the first upgrade. + # openshift_version, openshift_image_tag, and openshift_pkg_version + # will be modified by openshift_version; we want to ensure these + # are initially set to first versions to ensure no accidental usage of + # second versions (eg, 3.8 and 3.9 respectively) are used. + l_double_upgrade_cp_reset_version: True + openshift_version: "{{ l_double_upgrade_first_version }}" + openshift_release: "{{ l_double_upgrade_first_release }}" + openshift_upgrade_target: '3.8' + openshift_upgrade_min: '3.7' + +# Now that we have force-set a different version, we need to update a few things +# to ensure we have settings that actually match what's in repos/registries. +- import_playbook: ../../../../init/version.yml diff --git a/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml index 9c7677f1b..c21862dea 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml @@ -17,32 +17,32 @@ l_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config" l_base_packages_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config" -## Check to see if they're running 3.7 and if so upgrade them to 3.8 on control plan -## If they've specified pkg_version or image_tag preserve that for later use -- name: Configure the upgrade target for the common upgrade tasks 3.8 +- name: Configure the initial upgrade target for the common upgrade tasks hosts: oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config tasks: - set_fact: - openshift_upgrade_target: '3.8' + # We use 3.9 here so when we run openshift_version we can get + # correct values for 3.9, 3.8 we will hard-code the values in + # ../pre/version_override.yml, if necessary. + openshift_upgrade_target: '3.9' openshift_upgrade_min: '3.7' - openshift_release: '3.8' - _requested_pkg_version: "{{ openshift_pkg_version if openshift_pkg_version is defined else omit }}" - openshift_pkg_version: '' - _requested_image_tag: "{{ openshift_image_tag if openshift_image_tag is defined else omit }}" + +## Check to see if we need to double upgrade (3.7 -> 3.8 -> 3.9) +- name: Configure variables for double upgrade + hosts: oo_masters_to_config:oo_etcd_to_config + tasks: + - set_fact: l_double_upgrade_cp: True + l_version_override_hosts: "oo_masters_to_config:oo_etcd_to_config" + l_double_upgrade_first_version: "3.8" + l_double_upgrade_first_release: "3.8" when: hostvars[groups.oo_first_master.0].openshift_currently_installed_version | version_compare('3.8','<') - - name: set l_force_image_tag_to_version = True - set_fact: - # Need to set this during 3.8 upgrade to ensure image_tag is set correctly - # to match 3.8 version - l_force_image_tag_to_version: True - when: _requested_image_tag is defined - - import_playbook: ../pre/config.yml # These vars a meant to exclude oo_nodes from plays that would otherwise include # them by default. vars: + l_version_override_hosts: "oo_masters_to_config:oo_etcd_to_config" l_openshift_version_set_hosts: "oo_etcd_to_config:oo_masters_to_config:!oo_first_master" l_openshift_version_check_hosts: "oo_masters_to_config:!oo_first_master" l_upgrade_repo_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config" @@ -52,46 +52,48 @@ l_upgrade_docker_target_hosts: "oo_masters_to_config:oo_etcd_to_config" l_upgrade_excluder_hosts: "oo_masters_to_config" openshift_protect_installed_version: False - when: hostvars[groups.oo_first_master.0].openshift_currently_installed_version | version_compare('3.8','<') + when: l_double_upgrade_cp | default(False) - name: Flag pre-upgrade checks complete for hosts without errors 3.8 hosts: oo_masters_to_config:oo_etcd_to_config tasks: - set_fact: pre_upgrade_complete: True - when: hostvars[groups.oo_first_master.0].openshift_currently_installed_version | version_compare('3.8','<') + when: l_double_upgrade_cp | default(False) # Pre-upgrade completed - name: Intermediate 3.8 Upgrade import_playbook: ../upgrade_control_plane.yml - when: hostvars[groups.oo_first_master.0].openshift_currently_installed_version | version_compare('3.8','<') + when: l_double_upgrade_cp | default(False) + +- name: Restore 3.9 version variables + hosts: oo_masters_to_config:oo_etcd_to_config + tasks: + - set_fact: + # all:!all == 0 hosts + l_version_override_hosts: "all:!all" + openshift_version: "{{ l_double_upgrade_saved_version }}" + openshift_release: "{{ l_double_upgrade_saved_release }}" + openshift_image_tag: "{{ l_double_upgrade_saved_tag }}" + openshift_pkg_version: "{{ l_double_upgrade_saved_pkgv }}" + when: l_double_upgrade_cp | default(False) ## 3.8 upgrade complete we should now be able to upgrade to 3.9 +- name: Clear some values now that we're done with double upgrades. + hosts: oo_masters_to_config:oo_etcd_to_config + tasks: + - set_fact: + l_double_upgrade_cp: False + l_double_upgrade_cp_reset_version: False -- name: Configure the upgrade target for the common upgrade tasks 3.9 +# We should be on 3.8 at this point, need to set upgrade_target to 3.9 +- name: Configure the upgrade target for second upgrade hosts: oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config tasks: - - meta: clear_facts - set_fact: openshift_upgrade_target: '3.9' openshift_upgrade_min: '3.8' - openshift_release: '3.9' - openshift_pkg_version: "{{ _requested_pkg_version if _requested_pkg_version is defined else '' }}" - # Set the user's specified image_tag for 3.9 upgrade if it was provided. - - set_fact: - openshift_image_tag: "{{ _requested_image_tag }}" - l_force_image_tag_to_version: False - when: _requested_image_tag is defined - # If the user didn't specify an image_tag, we need to force update image_tag - # because it will have already been set during 3.8. If we aren't running - # a double upgrade, then we can preserve image_tag because it will still - # be the user provided value. - - set_fact: - l_force_image_tag_to_version: True - when: - - l_double_upgrade_cp is defined and l_double_upgrade_cp - - _requested_image_tag is not defined - import_playbook: ../pre/config.yml # These vars a meant to exclude oo_nodes from plays that would otherwise include @@ -106,7 +108,6 @@ l_upgrade_docker_target_hosts: "oo_masters_to_config:oo_etcd_to_config" l_upgrade_excluder_hosts: "oo_masters_to_config" openshift_protect_installed_version: False - openshift_version_reinit: True - name: Flag pre-upgrade checks complete for hosts without errors hosts: oo_masters_to_config:oo_etcd_to_config |