From f96d38bc6e565b5015cb1d88a59e4cae5abda837 Mon Sep 17 00:00:00 2001 From: Heitor Matsui Date: Thu, 11 Aug 2022 11:56:04 -0300 Subject: [PATCH] Enable upgrades to next release version This commit updates variables to allow AIO-SX upgrades to next release version. Test Plan: PASS: upgrade Centos -> Centos AIO-SX Story: 2009303 Task: 46001 Change-Id: Id4b82328f0c5cff859d04ffa7fa30f8003df36c7 Signed-off-by: Heitor Matsui --- .../roles/bootstrap/validate-config/vars/main.yml | 2 +- .../src/playbooks/vars/upgrade-platform/main.yml | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/playbookconfig/src/playbooks/roles/bootstrap/validate-config/vars/main.yml b/playbookconfig/src/playbooks/roles/bootstrap/validate-config/vars/main.yml index 35f6d560b..9221c4a93 100644 --- a/playbookconfig/src/playbooks/roles/bootstrap/validate-config/vars/main.yml +++ b/playbookconfig/src/playbooks/roles/bootstrap/validate-config/vars/main.yml @@ -8,7 +8,7 @@ private_pxeboot_subnet: 169.254.202.0/24 pxecontroller_floating_hostname: pxecontroller use_entire_pxeboot_subnet: true -upgrade_k8s_version: 1.21.8 +upgrade_k8s_version: 1.23.1 fresh_install_k8s_version: 1.23.1 # These variables are only used for subcloud configuration and are set diff --git a/playbookconfig/src/playbooks/vars/upgrade-platform/main.yml b/playbookconfig/src/playbooks/vars/upgrade-platform/main.yml index 078c03792..e3f1987f6 100644 --- a/playbookconfig/src/playbooks/vars/upgrade-platform/main.yml +++ b/playbookconfig/src/playbooks/vars/upgrade-platform/main.yml @@ -4,10 +4,3 @@ restore_in_progress_flag: /etc/platform/.restore_in_progress wipe_ceph_osds: false migrate_platform_data: true skip_version_check: true -# From 21.12 to 22.02 upgrade, the N release still have repo in /www. -# This is different from a restore from a 22.02 backup. -# The overwrite below is needed only for 22.02 release in which -# /www is relocated to /var/www. -# TODO: from 22.02 + 1 release, remove this line below to use -# the same patching repo path as restore scenario. -patching_repo_permdir: /www/pages/updates