From 7bfb0acaea518e1ca7a64228ac5098f1bc7a9bc9 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 3 Jan 2018 23:41:32 +0100 Subject: [baremetal] Switch VCP base image to UCA Since Mirantis prebuilt image comes with salt-minion 2016.3 instead of 2016.11 and upgrading it leads to a hard to break catch-22, use the Ubuntu cloud archive image we already download for FN VMs and pre-install: - a newer kernel (hwe-edge); - salt-minion (2016.11); This also implicitly aligns the image handling on AArch64 and x86_64. Change-Id: I86d1c777449d37bdd0348936a598e3ffe9d265af Signed-off-by: Alexandru Avadanii (cherry picked from commit f37103b4d60f057f653e0e5e8b7c6c3023a95b2d) --- mcp/config/scenario/defaults-x86_64.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'mcp/config') diff --git a/mcp/config/scenario/defaults-x86_64.yaml b/mcp/config/scenario/defaults-x86_64.yaml index 4dfff71db..4db3aad61 100644 --- a/mcp/config/scenario/defaults-x86_64.yaml +++ b/mcp/config/scenario/defaults-x86_64.yaml @@ -11,3 +11,19 @@ virtual: default: vcpus: 2 ram: 4096 + common: + apt: + keys: + - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/SALTSTACK-GPG-KEY.pub + repos: + # deb [arch=] + - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main + pkg: + install: + - linux-image-generic-hwe-16.04-edge + - linux-headers-generic-hwe-16.04-edge + - salt-minion + control: + pkg: + install: + - cloud-init -- cgit 1.2.3-korg