From 2600894360be0dd0676680e3ced73c4f361a58c0 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 20 Jan 2020 12:12:50 +0100 Subject: all: Pin Ubuntu kernel to 5.0.0-37 for Bionic Ubuntu kernel meta packages are all broken on at least one platform architecture, so pin the kernel version to 5.0.0-37, which is known to be stable. Make the kernel version configurable via a new enviroment variable, MCP_KERNEL_VER in globals.sh. If not defined, the ga-18.04 kernel is left unchanged (based on upstream kernel 4.15), except for baremetal nodes providioned by MaaS which currently use the HWE kernel (based on 5.3 in Bionic). Change-Id: I648d09b22f6080efd2bce26b6a06fecc3f6b4599 Signed-off-by: Alexandru Avadanii (cherry picked from commit 04f7737967a1a9e84c6e17482acd466b46eebc48) --- mcp/config/scenario/defaults.yaml.j2 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'mcp/config/scenario') diff --git a/mcp/config/scenario/defaults.yaml.j2 b/mcp/config/scenario/defaults.yaml.j2 index cd5cb04cd..48fb954cc 100644 --- a/mcp/config/scenario/defaults.yaml.j2 +++ b/mcp/config/scenario/defaults.yaml.j2 @@ -33,8 +33,9 @@ x86_64: - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/18.04/amd64/2017.7 bionic main pkg: install: - {%- if '-iec-' not in conf.MCP_DEPLOY_SCENARIO %} - - linux-generic-hwe-18.04 + {%- if '-iec-' not in conf.MCP_DEPLOY_SCENARIO and conf.MCP_KERNEL_VER %} + - linux-image-{{ conf.MCP_KERNEL_VER }}-generic + - linux-headers-{{ conf.MCP_KERNEL_VER }}-generic {%- endif %} - salt-minion - ifupdown @@ -99,8 +100,9 @@ aarch64: - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/18.04/amd64/2017.7 bionic main pkg: install: - {%- if '-iec-' not in conf.MCP_DEPLOY_SCENARIO %} - - linux-generic-hwe-18.04 + {%- if '-iec-' not in conf.MCP_DEPLOY_SCENARIO and conf.MCP_KERNEL_VER %} + - linux-image-{{ conf.MCP_KERNEL_VER }}-generic + - linux-headers-{{ conf.MCP_KERNEL_VER }}-generic {%- endif %} - salt-minion - ifupdown -- cgit 1.2.3-korg