Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/216118
Change subject: install-server: provision new restbase machines
......................................................................
install-server: provision new restbase machines
new hardware specs have two SSDs, not three
Bug: T101112
Change-Id: I170b2f33d374bab2be8a8dac864968312469df88
---
M modules/install-server/files/autoinstall/netboot.cfg
A modules/install-server/files/autoinstall/partman/cassandrahosts-2ssd.cfg
R modules/install-server/files/autoinstall/partman/cassandrahosts-3ssd.cfg
3 files changed, 72 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/18/216118/1
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index c10a48d..abb6c0f 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -95,8 +95,9 @@
snapshot[1-4]|snapshot100[1-4]) echo partman/snapshot.cfg ;; \
stat1002) echo partman/lvm-noraid-large.a.cfg ;; \
argon|bast4001|copper|neon|ruthenium|subra|suhail|titanium|ytterbium|zirconium)
echo partman/raid1-lvm.cfg ;; \
- cerium|praseodymium|xenon) echo partman/cassandrahosts.cfg ;; \
- restbase1*) echo partman/cassandrahosts.cfg ;; \
+ cerium|praseodymium|xenon) echo partman/cassandrahosts-3ssd.cfg
;; \
+ restbase100[1-6]) echo partman/cassandrahosts-3ssd.cfg ;; \
+ restbase100[789]) echo partman/cassandrahosts-2ssd.cfg ;; \
virt100[1-9]) echo partman/virt-raid10-cisco.cfg ;; \
virt101[0-2]) echo partman/virt-hp.cfg ;; \
labvirt100[1-9]) echo partman/virt-hp.cfg ;; \
diff --git
a/modules/install-server/files/autoinstall/partman/cassandrahosts-2ssd.cfg
b/modules/install-server/files/autoinstall/partman/cassandrahosts-2ssd.cfg
new file mode 100644
index 0000000..3dc4adf
--- /dev/null
+++ b/modules/install-server/files/autoinstall/partman/cassandrahosts-2ssd.cfg
@@ -0,0 +1,69 @@
+# Automatic software RAID partitioning
+#
+# * 2 SSD, sda, sdb
+# * LVM
+# * layout:
+# - /: ext4, RAID1
+# - swap: RAID1, 1GB
+# - /var: RAID0, on ssd
+
+d-i partman-auto/method string raid
+d-i partman-md/device_remove_md boolean true
+d-i partman-lvm/device_remove_lvm boolean true
+d-i partman/alignment select optimal
+
+d-i partman-auto/disk string /dev/sda /dev/sdb
+d-i partman-auto/choose_recipe select raid1-root
+
+# Define physical partitions
+d-i partman-auto/expert_recipe string \
+ raid1-root :: \
+ 30000 1 30000 raid \
+ $primary{ } method{ raid } \
+ $lvmignore{ } \
+ . \
+ 1000 2 1000 raid \
+ $primary{ } method{ raid } \
+ $lvmignore{ } \
+ . \
+ 100000 3 -1 raid \
+ $primary{ } method{ raid } \
+ $lvmignore{ } \
+ . \
+ 100000 4 -1 ext4 \
+ $lvmok{ } \
+ $defaultignore{ } \
+ lv_name{ var } \
+ method{ format } \
+ format{ } \
+ use_filesystem{ } \
+ filesystem{ ext4 } \
+ mountpoint{ /var } \
+ .
+
+# Parameters are:
+# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
+# <devices> <sparedevices>
+d-i partman-auto-raid/recipe string \
+ 1 3 1 ext4 / \
+ /dev/sda1#/dev/sdb1 \
+ . \
+ 1 3 0 swap - \
+ /dev/sda2#/dev/sdb2 \
+ . \
+ 0 3 0 lvm - \
+ /dev/sda3#/dev/sdb3 \
+ .
+
+d-i partman-md/confirm boolean true
+d-i partman-md/confirm_nooverwrite boolean true
+d-i partman/confirm_write_new_label boolean true
+d-i partman/choose_partition select finish
+d-i partman/confirm boolean true
+d-i partman/confirm_nooverwrite boolean true
+
+d-i partman-auto-lvm/guided_size string 80%
+d-i partman-lvm/confirm boolean true
+d-i partman-lvm/confirm_nooverwrite boolean true
+d-i partman-lvm/device_remove_lvm boolean true
+d-i mdadm/boot_degraded boolean true
diff --git
a/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
b/modules/install-server/files/autoinstall/partman/cassandrahosts-3ssd.cfg
similarity index 100%
rename from modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
rename to
modules/install-server/files/autoinstall/partman/cassandrahosts-3ssd.cfg
--
To view, visit https://gerrit.wikimedia.org/r/216118
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I170b2f33d374bab2be8a8dac864968312469df88
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
