openstack/openstack-helm-infra
Code Issues Proposed changes

Update several default ubuntu release defaults

Browse Source 
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
This commit is contained in:
Gage Hugo 2022-04-27 11:29:27 -05:00
parent 92977da6b8
commit d200c97464
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/osh-run-script-set/defaults/main.yaml
View File

@ -13,6 +13,6 @@
--- ---
osh_params: osh_params:
container_distro_name: ubuntu container_distro_name: ubuntu
container_distro_version: xenial container_distro_version: focal
# feature_gates: # feature_gates:
... ...

2
roles/osh-run-script/defaults/main.yaml
View File

@ -13,6 +13,6 @@
--- ---
osh_params: osh_params:
container_distro_name: ubuntu container_distro_name: ubuntu
container_distro_version: xenial container_distro_version: focal
# feature_gates: # feature_gates:
... ...

2
tools/deployment/common/get-values-overrides.sh
View File

@ -18,7 +18,7 @@ HELM_CHART="$1"
: "${HELM_CHART_ROOT_PATH:="../openstack-helm-infra"}" : "${HELM_CHART_ROOT_PATH:="../openstack-helm-infra"}"
: "${CONTAINER_DISTRO_NAME:="ubuntu"}" : "${CONTAINER_DISTRO_NAME:="ubuntu"}"
: "${CONTAINER_DISTRO_VERSION:="xenial"}" : "${CONTAINER_DISTRO_VERSION:="focal"}"
: "${FEATURE_GATES:="apparmor"}" : "${FEATURE_GATES:="apparmor"}"
OSH_INFRA_FEATURE_MIX="${FEATURE_GATES},${CONTAINER_DISTRO_NAME}_${CONTAINER_DISTRO_VERSION},${CONTAINER_DISTRO_NAME}" OSH_INFRA_FEATURE_MIX="${FEATURE_GATES},${CONTAINER_DISTRO_NAME}_${CONTAINER_DISTRO_VERSION},${CONTAINER_DISTRO_NAME}"