:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: : Copyright (c) 2017 Enea AB and others. : : All rights reserved. This program and the accompanying materials : are made available under the terms of the Apache License, Version 2.0 : which accompanies this distribution, and is available at : http://www.apache.org/licenses/LICENSE-2.0 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: From: Alexandru Avadanii Date: Sun, 5 Nov 2017 21:02:17 +0100 Subject: [PATCH] baremetal: linux-image-generic-hwe-16.04-edge The Salt way to pin the kernel version is via its reclass model, by defining system.kernel.version. However, this only works with explicit kernel package names and not with meta package names (e.g. linux-image-4.13.0-9916-generic is expected instead of linux-image-generic-hwe-16.04-edge, which would break the `linux_kernel_old_absent` state). For now, let's explicitly call `pkg.install` for the kernel and headers packages, using the meta package name to ensure automatic fallback to Ubuntu packages if Armband repos are missing, respectively to automatically pick up new kernel package names in case of meta + kernel packages bump later. JIRA: ARMBAND-280 Signed-off-by: Alexandru Avadanii --- mcp/config/states/baremetal_init | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init index ea4d23c..ed3f287 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init @@ -25,9 +25,12 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ salt -C 'kvm*' pkg.install bridge-utils salt -C 'kvm* or cmp*' state.apply opnfv.adduser salt -C 'kvm*' state.apply linux.network -salt -C 'cmp*' state.apply linux.system +salt -C 'kvm* or cmp*' state.apply linux.system salt -C 'cmp*' state.apply linux.network || true salt -C 'kvm*' state.apply armband.salt_minion || true +# NOTE(armband): Should be later moved to reclass as system.kernel.version +salt -C 'kvm* or cmp*' pkg.install \ + linux-image-generic-hwe-16.04-edge,linux-headers-generic-hwe-16.04-edge salt -C 'kvm* or cmp*' system.reboot wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ "tee /dev/stderr | grep -Fq 'Not connected'"