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/scripts/globals.sh | 1 + mcp/scripts/pharos | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'mcp/scripts') diff --git a/mcp/scripts/globals.sh b/mcp/scripts/globals.sh index 29506dc8f..e5d1decc6 100644 --- a/mcp/scripts/globals.sh +++ b/mcp/scripts/globals.sh @@ -13,6 +13,7 @@ export SSH_KEY=${SSH_KEY:-"/var/lib/opnfv/mcp.rsa"} export SALT_MASTER=${INSTALLER_IP:-10.20.0.2} export SALT_MASTER_USER=${SALT_MASTER_USER:-ubuntu} export VIRSH=${VIRSH:-'virsh --connect qemu:///system'} +export MCP_KERNEL_VER=${MCP_KERNEL_VER:-5.0.0-37} # Derived from INSTALLER_IP export MCPCONTROL_NET=${MCPCONTROL_NET:-${SALT_MASTER%.*}.0} diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos index 9b9235ea1..061b5588d 160000 --- a/mcp/scripts/pharos +++ b/mcp/scripts/pharos @@ -1 +1 @@ -Subproject commit 9b9235ea136928b8148c57b1c3f3ddee6f761e66 +Subproject commit 061b5588d40253193eddf76139c361d62e6fbeb4 -- cgit 1.2.3-korg