From d200c9746448e9d12e2014e49d8aaf4fc0d3ecbb Mon Sep 17 00:00:00 2001 From: Gage Hugo Date: Wed, 27 Apr 2022 11:29:27 -0500 Subject: [PATCH] Update several default ubuntu release defaults Several roles and scripts in the osh-infra repo have defaults for ubuntu that are still on xenial when we mostly run bionic or newer. This change updates these references to default to focal. Change-Id: I84bca2d685cf1c67b10eee3bb7c05deb2cc4670b --- roles/osh-run-script-set/defaults/main.yaml | 2 +- roles/osh-run-script/defaults/main.yaml | 2 +- tools/deployment/common/get-values-overrides.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/osh-run-script-set/defaults/main.yaml b/roles/osh-run-script-set/defaults/main.yaml index 8de078a0b..856388323 100644 --- a/roles/osh-run-script-set/defaults/main.yaml +++ b/roles/osh-run-script-set/defaults/main.yaml @@ -13,6 +13,6 @@ --- osh_params: container_distro_name: ubuntu - container_distro_version: xenial + container_distro_version: focal # feature_gates: ... diff --git a/roles/osh-run-script/defaults/main.yaml b/roles/osh-run-script/defaults/main.yaml index 8de078a0b..856388323 100644 --- a/roles/osh-run-script/defaults/main.yaml +++ b/roles/osh-run-script/defaults/main.yaml @@ -13,6 +13,6 @@ --- osh_params: container_distro_name: ubuntu - container_distro_version: xenial + container_distro_version: focal # feature_gates: ... diff --git a/tools/deployment/common/get-values-overrides.sh b/tools/deployment/common/get-values-overrides.sh index 7b285ab22..d46816eb9 100755 --- a/tools/deployment/common/get-values-overrides.sh +++ b/tools/deployment/common/get-values-overrides.sh @@ -18,7 +18,7 @@ HELM_CHART="$1" : "${HELM_CHART_ROOT_PATH:="../openstack-helm-infra"}" : "${CONTAINER_DISTRO_NAME:="ubuntu"}" -: "${CONTAINER_DISTRO_VERSION:="xenial"}" +: "${CONTAINER_DISTRO_VERSION:="focal"}" : "${FEATURE_GATES:="apparmor"}" OSH_INFRA_FEATURE_MIX="${FEATURE_GATES},${CONTAINER_DISTRO_NAME}_${CONTAINER_DISTRO_VERSION},${CONTAINER_DISTRO_NAME}"