BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196528
Change subject: update varnish disk stuff for cp104[34] (misc)
......................................................................
update varnish disk stuff for cp104[34] (misc)
Change-Id: I511c116dfe0435e532e6084f9a69496cd7d97fcf
---
M manifests/role/cache.pp
M modules/install-server/files/autoinstall/netboot.cfg
2 files changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/28/196528/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index f61aab3..35159a3 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -813,11 +813,12 @@
if $::realm == 'production' {
if os_version('debian >= jessie') {
$storage_size_main = $::hostname ? {
- 'cp1008' => 117,
- /^amssq/ => 117, # Intel X-25M 160G
+ 'cp1008' => 117, # Intel X-25M 160G
+ /^amssq/ => 117, # Intel X-25M 160G
+ /^cp104[34]/ => 117, # Intel X-25M 160G
/^cp30(0[3-9]|1[0-4])$/ => 460, # Intel M320 600G via H710
- /^cp301[5-8]$/ => 225, # Intel M320 300G via H710
- default => 360, # Intel S3700 400G
+ /^cp301[5-8]$/ => 225, # Intel M320 300G via H710
+ default => 360, # Intel S3700 400G
}
}
else {
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index 0f7107f..3d2744a 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -56,7 +56,7 @@
boron|chromium|hydrogen) echo partman/lvm.cfg ;; \
calcium|helium|potassium|tmh1001|tmh1002) echo
partman/raid1-1partition.cfg ;; \
acamar|achernar|baham|cobalt|lead|lithium|polonium) echo
partman/raid1-lvm.cfg ;; \
- cp1008|cp300[3-9]|cp301[0-9]|cp302[0-2]) echo
partman/varnish-oldssd.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 ;;
\
d-i-test) echo partman/flat.cfg ;; \
antimony|arsenic|caesium|erbium|gadolinium|heze|magnesium|neodymium|palladium|promethium|rubidium|strontium|terbium)
echo partman/lvm.cfg ;; \
--
To view, visit https://gerrit.wikimedia.org/r/196528
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I511c116dfe0435e532e6084f9a69496cd7d97fcf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
