aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/config/scenario
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2020-01-20 12:12:50 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2020-01-28 13:10:18 +0000
commit2600894360be0dd0676680e3ced73c4f361a58c0 (patch)
tree59f4568b848be58d45cb42163edd5d10a00586ff /mcp/config/scenario
parent279195ddeb8e459a5931430f0841724ba6c06db1 (diff)
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 <Alexandru.Avadanii@enea.com> (cherry picked from commit 04f7737967a1a9e84c6e17482acd466b46eebc48)
Diffstat (limited to 'mcp/config/scenario')
-rw-r--r--mcp/config/scenario/defaults.yaml.j210
1 files changed, 6 insertions, 4 deletions
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