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 <Alexandru.Avadanii@enea.com>

2 files changed, 50 insertions, 36 deletions

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 <Alexandru.Avadanii@enea.com>
+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 <Alexandru.Avadanii@enea.com>
+---
+ 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
diff --git a/patches/fuel-agent/kernel-bump/0001-kernel-flavor-linux-image-generic-lts-xenial.patch b/patches/fuel-agent/kernel-bump/0001-kernel-flavor-linux-image-generic-lts-xenial.patch
deleted file mode 100644
index 8d5ac1a2..00000000
--- a/patches/fuel-agent/kernel-bump/0001-kernel-flavor-linux-image-generic-lts-xenial.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: 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 <Alexandru.Avadanii@enea.com>
-Date: Thu, 4 Aug 2016 12:44:53 +0200
-Subject: [PATCH] kernel-flavor: linux-image-generic-lts-xenial
-
-Ubuntu arm64: switch from using kernel 4.2 for Trusty
-(linux-image-generic-lts-trusty) to kernel 4.4 backported from Xenial
-(linux-image-generic-lts-xenial).
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- fuel_agent/drivers/nailgun.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fuel_agent/drivers/nailgun.py b/fuel_agent/drivers/nailgun.py
-index f70d165..ef0e79a 100644
---- a/fuel_agent/drivers/nailgun.py
-+++ b/fuel_agent/drivers/nailgun.py
-@@ -727,8 +727,8 @@ class NailgunBuildImage(BaseDataDriver):
-         "i40e-dkms",
-         "linux-firmware",
-         "linux-firmware-nonfree",
--        "linux-headers-generic-lts-trusty",
--        "linux-image-generic-lts-trusty",
-+        "linux-headers-generic-lts-xenial",
-+        "linux-image-generic-lts-xenial",
-         "lvm2",
-         "mcollective",
-         "mdadm",