BBlack has submitted this change and it was merged.
Change subject: progress on cp3xxx storage config
......................................................................
progress on cp3xxx storage config
Change-Id: I3d25aa5df2d7f6f089d3101bcf4d1d91845b2312
---
M manifests/role/cache.pp
M modules/install-server/files/autoinstall/netboot.cfg
2 files changed, 5 insertions(+), 11 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 8ec194b..cea080f 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -804,17 +804,11 @@
if $::realm == 'production' {
if os_version('debian >= jessie') {
$storage_size_main = $::hostname ? {
- /^amssq/ => 117,
'cp1008' => 117,
- # XXX
- # /^cp30/ => ??? wtf?
- # by-current-df-values:
- # ~435: uploads: 3,5,6,7,8 mobile: 11,12
- # ~455: mobile: 13,14
- # ~545: uploads: 4,9,10
- # ~225: uploads: 15,16,17,18
- # will sort as reinstalled, and recheck storage
controller bios setup...
- default => 360,
+ /^amssq/ => 117, # Intel X-25M 160G
+ /^cp30(0[3-9]|1[0-4])$/ => 450, # Intel M320 600G via H710
# XXX size needs update
+ /^cp301[5-8]$/ => 220, # Intel M320 300G via H710
# XXX size needs update
+ 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 7c0e76a..d5415bf 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) echo partman/varnish-oldssd.cfg ;; \
+ cp1008|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/194504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d25aa5df2d7f6f089d3101bcf4d1d91845b2312
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
