Merge "def kernel-flavor: linux-image-generic-lts-xenial"

4 files changed, 118 insertions, 35 deletions

diff --git a/patches/fuel-agent/0011-kernel-flavor-linux-image-generic-lts-xenial.patch b/patches/fuel-agent/0011-kernel-flavor-linux-image-generic-lts-xenial.patch
new file mode 100644
index 00000000..c94bc4aa
--- /dev/null
+++ b/patches/fuel-agent/0011-kernel-flavor-linux-image-generic-lts-xenial.patch
@@ -0,0 +1,28 @@
+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 5ff1cf6..1463f22 100644
+--- a/fuel_agent/drivers/nailgun.py
++++ b/fuel_agent/drivers/nailgun.py
+@@ -734,8 +734,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",
diff --git a/patches/fuel-agent/0011-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch b/patches/fuel-agent/0011-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch
deleted file mode 100644
index b0c32f4f..00000000
--- a/patches/fuel-agent/0011-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Mon, 9 May 2016 21:46:51 +0200
-Subject: [PATCH] target Ubuntu: Blacklist rtc-efi if not supported.
-
-Older ThunderX and possibly other UEFI-enabled targets do not support
-rtc-efi properly, so they end up filling dmesg with useless
-complaints about not being able to read system time.
-
-Target OS (Ubuntu) deployment already has a snippet that blacklists
-i2c_piix4 in certain scenarios, so provide a similar test for rtc_efi.
----
- cloud-init-templates/boothook_fuel_7.0_ubuntu.jinja2 | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/cloud-init-templates/boothook_fuel_7.0_ubuntu.jinja2 b/cloud-init-templates/boothook_fuel_7.0_ubuntu.jinja2
-index 253be2d..9758376 100644
---- a/cloud-init-templates/boothook_fuel_7.0_ubuntu.jinja2
-+++ b/cloud-init-templates/boothook_fuel_7.0_ubuntu.jinja2
-@@ -49,8 +49,14 @@ cloud-init-per instance resolv_conf_head_nameserver /bin/sh -c 'echo nameserver
- # configure black module lists
- # virt-what should be installed
- if [ ! -f /etc/modprobe.d/blacklist-i2c_piix4.conf ]; then
--    ( (virt-what | fgrep -q "virtualbox") && echo "blacklist i2c_piix4" >> /etc/modprobe.d/blacklist-i2c_piix4.conf || :) && update-initramfs -u -k all
--    modprobe -r i2c_piix4
-+    ( (virt-what | fgrep -q "virtualbox") && \
-+        ( echo "blacklist i2c_piix4" >> /etc/modprobe.d/blacklist-i2c_piix4.conf && \
-+        update-initramfs -u -k all && modprobe -r i2c_piix4 ) || :)
-+fi
-+if [ ! -f /etc/modprobe.d/blacklist-rtc_efi.conf ]; then
-+    ( /bin/cat /sys/class/rtc/rtc0/time > /dev/null 2>&1 ) || \
-+        ( echo "blacklist rtc_efi" >> /target/etc/modprobe.d/blacklist-rtc_efi.conf && \
-+        update-initramfs -u -k all && modprobe -r rtc_efi )
- fi
- 
- cloud-init-per instance conntrack_ipv4 /bin/sh -c 'echo nf_conntrack_ipv4 | tee -a /etc/modules'
diff --git a/patches/fuel-web/0007-kernel-flavor-linux-image-generic-lts-xenial.patch b/patches/fuel-web/0007-kernel-flavor-linux-image-generic-lts-xenial.patch
new file mode 100644
index 00000000..5a068d6f
--- /dev/null
+++ b/patches/fuel-web/0007-kernel-flavor-linux-image-generic-lts-xenial.patch
@@ -0,0 +1,39 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Thu, 4 Aug 2016 12:47:50 +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>
+---
+ nailgun/nailgun/fixtures/openstack.yaml | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
+index 9c34a05..6848424 100644
+--- a/nailgun/nailgun/fixtures/openstack.yaml
++++ b/nailgun/nailgun/fixtures/openstack.yaml
+@@ -2103,8 +2103,8 @@
+               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
+@@ -2447,8 +2447,8 @@
+               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
diff --git a/patches/opnfv-fuel/0001-kernel-flavor-linux-image-generic-lts-xenial.patch b/patches/opnfv-fuel/0001-kernel-flavor-linux-image-generic-lts-xenial.patch
new file mode 100644
index 00000000..70847ba7
--- /dev/null
+++ b/patches/opnfv-fuel/0001-kernel-flavor-linux-image-generic-lts-xenial.patch
@@ -0,0 +1,51 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Thu, 4 Aug 2016 12:50:19 +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>
+---
+ build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml | 4 ++--
+ deploy/config/dea_base.yaml                         | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
+index daef3d5..2985619 100644
+--- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
++++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
+@@ -5,7 +5,7 @@
+   extra_dirs:
+     - /usr/share/fuel_bootstrap_cli/files/trusty
+   output_dir: /tmp/
+-  kernel_flavor: linux-image-generic-lts-trusty
++  kernel_flavor: linux-image-generic-lts-xenial
+   packages:
+     - fuel-agent
+     - hwloc
+@@ -13,6 +13,6 @@
+     - i40e-dkms
+     - linux-firmware
+     - linux-firmware-nonfree
+-    - linux-headers-generic
++    - linux-headers-generic-lts-xenial
+     - live-boot
+     - live-boot-initramfs-tools
+diff --git a/deploy/config/dea_base.yaml b/deploy/config/dea_base.yaml
+index 658b328..5f3c156 100644
+--- a/deploy/config/dea_base.yaml
++++ b/deploy/config/dea_base.yaml
+@@ -474,9 +474,9 @@ settings:
+ 
+           linux-firmware-nonfree
+ 
+-          linux-headers-generic-lts-trusty
++          linux-headers-generic-lts-xenial
+ 
+-          linux-image-generic-lts-trusty
++          linux-image-generic-lts-xenial
+ 
+           lvm2
+