From f4296ca4cf69c632b53ce1dacf9333b290b8a014 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 9 Apr 2017 15:42:01 +0200 Subject: fuel, docs: fuel-menu: Align defaults with OPNFV Since Armband alters the bootstrap package list and/or kernel version, hanlded previously by fuel_bootstrap_cli.yaml, we need to refactor our patches a bit. NOTE: deploy-cache: We no longer include bootstrap package list in the bootstrap fingerprint; we only rely on the repo mirrors fingerprints, since bootstrap package list is mostly static across release cycles. Upstream-bug: https://bugs.launchpad.net/fuel/+bug/1679636 JIRA: FUEL-266 JIRA: ARMBAND-225 Change-Id: I6c1b090df6eff69d60fa7ca779b3dde527e77879 Signed-off-by: Alexandru Avadanii (cherry picked from commit 48a9297abfe3b35da1a5c3e8b44a823be24af00e) --- ...otstrap-defaults-Pin-kernel-to-4.8.0-9944.patch | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 patches/fuel-agent/kernel-bump/0001-bootstrap-defaults-Pin-kernel-to-4.8.0-9944.patch (limited to 'patches/fuel-agent/kernel-bump/0001-bootstrap-defaults-Pin-kernel-to-4.8.0-9944.patch') diff --git a/patches/fuel-agent/kernel-bump/0001-bootstrap-defaults-Pin-kernel-to-4.8.0-9944.patch b/patches/fuel-agent/kernel-bump/0001-bootstrap-defaults-Pin-kernel-to-4.8.0-9944.patch new file mode 100644 index 00000000..e9a88280 --- /dev/null +++ b/patches/fuel-agent/kernel-bump/0001-bootstrap-defaults-Pin-kernel-to-4.8.0-9944.patch @@ -0,0 +1,50 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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: Tue, 14 Mar 2017 19:56:50 +0100 +Subject: [PATCH] bootstrap defaults: Pin kernel to 4.8.0-9944 + +Since newer kernels have issues with AAVMF + vhost_net, +we need to also temporarily blacklist vhost_net. + +TODO: Remove vhost_net blacklist (later). + +JIRA: https://jira.opnfv.org/browse/ARMBAND-161 +JIRA: https://jira.opnfv.org/browse/ARMBAND-171 +JIRA: https://jira.opnfv.org/browse/ARMBAND-227 +JIRA: https://jira.opnfv.org/browse/ARMBAND-230 +JIRA: https://jira.opnfv.org/browse/ARMBAND-239 +JIRA: https://jira.opnfv.org/browse/ARMBAND-244 + +Signed-off-by: Alexandru Avadanii +--- + contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/settings.yaml.sample | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/settings.yaml.sample b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/settings.yaml.sample +index ff5baa8..42765b6 100644 +--- a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/settings.yaml.sample ++++ b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/settings.yaml.sample +@@ -13,13 +13,14 @@ + output_dir: /tmp/ + # Defines kernel version +-kernel_flavor: linux-image-generic-lts-xenial ++kernel_flavor: linux-image-4.8.0-9944-generic + # Define packages list + packages: + - daemonize + - fuel-agent + - hwloc + - i40e-dkms + - linux-firmware +- - linux-headers-generic ++ - linux-image-extra-4.8.0-9944-generic ++ - linux-headers-4.8.0-9944-generic + - live-boot + - live-boot-initramfs-tools -- cgit 1.2.3-korg