Muehlenhoff has submitted this change and it was merged.
Change subject: autoinstall: install linux-meta (3.19) on jessie
......................................................................
autoinstall: install linux-meta (3.19) on jessie
Bug: T100773
Change-Id: Id50335dcd3c75148719200d41029310923fb971a
---
M modules/install-server/files/autoinstall/scripts/late_command
1 file changed, 9 insertions(+), 4 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, but someone else must approve
Muehlenhoff: Verified; Looks good to me, approved
Faidon Liambotis: Looks good to me, but someone else must approve
BBlack: Looks good to me, but someone else must approve
diff --git a/modules/install-server/files/autoinstall/scripts/late_command
b/modules/install-server/files/autoinstall/scripts/late_command
index d09b471..2eb834b 100644
--- a/modules/install-server/files/autoinstall/scripts/late_command
+++ b/modules/install-server/files/autoinstall/scripts/late_command
@@ -24,8 +24,7 @@
apt-install ixgbe-dkms
fi
-# kernel update + optimized mkfs for all cache nodes
-# (the upgrade is to grab our updated firmware packages first for initramfs...)
+# optimized mkfs for all cache nodes
# (the crazy PHYS_CORES thing is to get the bnx2x option set before the first
boot,
# otherwise we'd need a reboot after puppet sets up the same file on the
first run)
case `hostname` in \
@@ -34,9 +33,15 @@
PHYS_CORES=$(chroot /target /usr/bin/ruby -e "require
'pathname'; print
Pathname::glob('/sys/devices/system/cpu/cpu[0-9]*/topology/thread_siblings_list').map{|x|
File.open(x,'r').read().split(',')[0] }.sort.uniq.count")
umount /target/sys
chroot /target /bin/sh -c "echo options bnx2x
num_queues=$PHYS_CORES >/etc/modprobe.d/rps.conf"
- chroot /target apt-get -y upgrade
- apt-install linux-meta
mke2fs -F -F -t ext4 -T huge -m 0 -L sda3-varnish /dev/sda3
mke2fs -F -F -t ext4 -T huge -m 0 -L sdb3-varnish /dev/sdb3
;; \
esac
+
+# Use a more recent kernel on jessie
+# (the upgrade is to grab our updated firmware packages first for initramfs)
+apt-install lsb-release
+if [ $(in-target lsb_release -c -s) = "jessie" ]; then
+ in-target apt-get -y upgrade
+ apt-install linux-meta
+fi
--
To view, visit https://gerrit.wikimedia.org/r/211688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id50335dcd3c75148719200d41029310923fb971a
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
