Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/373863 )
Change subject: install_server: add partman for cassandra JBOD
......................................................................
install_server: add partman for cassandra JBOD
Note the individual filesystems on the "big" partition that's used for
JBOD are only formatted by partman, not mounted. partman doesn't seem to
support string interpolation for the mountpoint specification in
recipes, we'll need to mount and add entries to fstab via puppet.
Bug: T169939
Change-Id: Iada7cb4e472bf6b27357f3ccec6410f9a3e4c996
---
M modules/install_server/files/autoinstall/netboot.cfg
A modules/install_server/files/autoinstall/partman/cassandrahosts-5ssd-jbod.cfg
2 files changed, 73 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index b747feb..84542bc 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -151,11 +151,13 @@
rdb100[5-6]|wdqs100[45]) echo partman/raid1-lvm-ext4-srv-noswap.cfg ;;
\
rdb100[7-8]) echo partman/raid1.cfg ;; \
rdb200[1-6]) echo partman/raid1-lvm-ext4-srv.cfg ;; \
- restbase100[0-9]) echo partman/cassandrahosts-5ssd.cfg ;; \
- restbase101[0-5]) echo partman/cassandrahosts-5ssd.cfg ;; \
+ restbase100[0-7]) echo partman/cassandrahosts-5ssd.cfg ;; \
+ restbase100[89]|restbase1010) echo
partman/cassandrahosts-5ssd-jbod.cfg ;; \
+ restbase101[1-5]) echo partman/cassandrahosts-5ssd.cfg ;; \
restbase101[6-8]|restbase-dev100[456]) echo
partman/cassandrahosts-4ssd.cfg ;; \
restbase-test2*) echo partman/cassandrahosts-2ssd.cfg ;; \
- restbase200[1-6]) echo partman/cassandrahosts-5ssd.cfg ;; \
+ restbase200[135]) echo partman/cassandrahosts-5ssd-jbod.cfg ;; \
+ restbase200[246]) echo partman/cassandrahosts-5ssd.cfg ;; \
restbase200[7-9]) echo partman/cassandrahosts-4ssd.cfg ;; \
restbase201[0-2]) echo partman/cassandrahosts-4ssd.cfg ;; \
rhenium) echo partman/raid1-gpt.cfg ;; \
diff --git
a/modules/install_server/files/autoinstall/partman/cassandrahosts-5ssd-jbod.cfg
b/modules/install_server/files/autoinstall/partman/cassandrahosts-5ssd-jbod.cfg
new file mode 100644
index 0000000..52367a2
--- /dev/null
+++
b/modules/install_server/files/autoinstall/partman/cassandrahosts-5ssd-jbod.cfg
@@ -0,0 +1,68 @@
+# Automatic software RAID partitioning
+#
+# * 5 SSD, sda, sdb, sdc, sdd, sde
+# * layout:
+# - /: ext4, RAID1
+# - swap: RAID1, 1GB
+# - /srv/cassandra/instance-data: RAID10, 50GB
+# - /srv/sd<ID>: ext4, remaining space on sd<ID>
+
+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 /dev/sdc /dev/sdd
/dev/sde
+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{ } \
+ . \
+ 50000 3 50000 raid \
+ $primary{ } method{ raid } \
+ $lvmignore{ } \
+ . \
+ 100000 4 -1 ext4 \
+ $primary{ } method{ format } \
+ $lvmignore{ } \
+ format{ } \
+ use_filesystem{ } \
+ filesystem{ ext4 } \
+ reserved_for_root{ 0 } \
+ .
+
+# Parameters are:
+# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
+# <devices> <sparedevices>
+d-i partman-auto-raid/recipe string \
+ 1 5 0 ext4 / \
+ /dev/sda1#/dev/sdb1#/dev/sdc1#/dev/sdd1#/dev/sde1
\
+ . \
+ 1 5 0 swap - \
+ /dev/sda2#/dev/sdb2#/dev/sdc2#/dev/sdd2#/dev/sde2
\
+ . \
+ 10 5 0 ext4 /srv/cassandra/instance-data
\
+ /dev/sda3#/dev/sdb3#/dev/sdc3#/dev/sdd3#/dev/sde3
\
+ .
+
+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-basicfilesystems/no_mount_point boolean false
+
+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
--
To view, visit https://gerrit.wikimedia.org/r/373863
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iada7cb4e472bf6b27357f3ccec6410f9a3e4c996
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Eevans <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
