BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205873
Change subject: remove amssq*/dysprosium from installer custom stuff
......................................................................
remove amssq*/dysprosium from installer custom stuff
Change-Id: I1206e7889753ccc2caef5d2f646a27e4b2d308a8
---
M modules/install-server/files/autoinstall/netboot.cfg
M modules/install-server/files/autoinstall/scripts/late_command
2 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/205873/1
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index 28fd8ff..ca99389 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -45,7 +45,6 @@
esac; \
\
case $(debconf-get netcfg/get_hostname) in \
- amssq*) echo partman/varnish-oldssd.cfg ;; \
analytics100[3-9]) echo partman/analytics-cisco.cfg ;; \
analytics101[1-9]|analytics102[0-2]) echo partman/raid1-30G.cfg
;; \
analytics102[3-7]) echo partman/analytics-dell.cfg ;; \
@@ -57,7 +56,7 @@
calcium|helium|potassium|tmh1001|tmh1002) echo
partman/raid1-1partition.cfg ;; \
acamar|achernar|baham|cobalt|lead|lithium|polonium) echo
partman/raid1-lvm.cfg ;; \
cp1008|cp104[34]|cp300[3-9]|cp301[0-9]|cp302[0-2]) echo
partman/varnish-oldssd.cfg ;; \
- cp[1234][0-9][0-9][0-9]|dysprosium) echo partman/varnish.cfg ;;
\
+ cp[1234][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \
d-i-test) echo partman/flat.cfg ;; \
antimony|arsenic|caesium|erbium|gadolinium|heze|magnesium|neodymium|palladium|promethium|rubidium|strontium|terbium)
echo partman/lvm.cfg ;; \
ganeti[12]00[0-9]) echo partman/ganeti.cfg ;; \
diff --git a/modules/install-server/files/autoinstall/scripts/late_command
b/modules/install-server/files/autoinstall/scripts/late_command
index af3e609..a34da9d 100644
--- a/modules/install-server/files/autoinstall/scripts/late_command
+++ b/modules/install-server/files/autoinstall/scripts/late_command
@@ -29,7 +29,7 @@
# (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 \
- amssq[0-9]*|cp[1234]*|dysprosium)
+ cp[1234]*)
mount -t sysfs none /target/sys
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
--
To view, visit https://gerrit.wikimedia.org/r/205873
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1206e7889753ccc2caef5d2f646a27e4b2d308a8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
