From 7bfb0acaea518e1ca7a64228ac5098f1bc7a9bc9 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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 <Alexandru.Avadanii@enea.com>
(cherry picked from commit f37103b4d60f057f653e0e5e8b7c6c3023a95b2d)
---
mcp/config/scenario/defaults-x86_64.yaml | 16 ++++++++++++++++
.../classes/cluster/all-mcp-ocata-common/x86_64/init.yml | 2 +-
mcp/scripts/requirements_deb.yaml | 0
mcp/scripts/requirements_rpm.yaml | 0
4 files changed, 17 insertions(+), 1 deletion(-)
mode change 100755 => 100644 mcp/scripts/requirements_deb.yaml
mode change 100755 => 100644 mcp/scripts/requirements_rpm.yaml
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:
+ # <repo name> <repo prio> deb [arch=<arch>] <repo url> <repo dist> <repo comp>
+ - 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
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
index a9a774bbb..1554a3291 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
@@ -8,7 +8,7 @@
---
parameters:
_param:
- salt_control_xenial_image: http://images.mirantis.com.s3.amazonaws.com/ubuntu-16-04-x64-latest.qcow2
+ salt_control_xenial_image: salt://salt/files/control/images/base_image_opnfv_fuel_vcp.img
# VMs spawned on Foundation Node / Jump Host net ifaces (max 4)
opnfv_fn_vm_primary_interface: ens3
diff --git a/mcp/scripts/requirements_deb.yaml b/mcp/scripts/requirements_deb.yaml
old mode 100755
new mode 100644
diff --git a/mcp/scripts/requirements_rpm.yaml b/mcp/scripts/requirements_rpm.yaml
old mode 100755
new mode 100644
--
cgit