Filippo Giunchedi has submitted this change and it was merged.
Change subject: install_server: move restbase test cluster to /srv
......................................................................
install_server: move restbase test cluster to /srv
Change-Id: Ie2ee9c150968d3d222c8247972018af7c7d5f3ae
---
M modules/install_server/files/autoinstall/netboot.cfg
A modules/install_server/files/autoinstall/partman/cassandrahosts-3ssd-srv.cfg
2 files changed, 70 insertions(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index d21f98a..1a69004 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -60,7 +60,7 @@
calcium|helium|potassium|tmh1002) echo
partman/raid1-1partition.cfg ;; \
capella|haedus|lawrencium|netmon1001|stat1002) echo
partman/db.cfg ;; \
carbon|stat1003) echo partman/raid5-gpt-lvm.cfg ;; \
- cerium|praseodymium|xenon) echo partman/cassandrahosts-3ssd.cfg
;; \
+ cerium|praseodymium|xenon) echo
partman/cassandrahosts-3ssd-srv.cfg ;; \
conf100[123]) echo partman/raid1-lvm-conf.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]) echo partman/varnish.cfg ;; \
diff --git
a/modules/install_server/files/autoinstall/partman/cassandrahosts-3ssd-srv.cfg
b/modules/install_server/files/autoinstall/partman/cassandrahosts-3ssd-srv.cfg
new file mode 100644
index 0000000..5aa3e80
--- /dev/null
+++
b/modules/install_server/files/autoinstall/partman/cassandrahosts-3ssd-srv.cfg
@@ -0,0 +1,69 @@
+# Automatic software RAID partitioning
+#
+# * 3 SSD, sda, sdb, sdc
+# * LVM
+# * layout:
+# - /: ext4, RAID1
+# - swap: RAID1, 1GB
+# - /srv: 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 /dev/sdc
+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{ srv } \
+ method{ format } \
+ format{ } \
+ use_filesystem{ } \
+ filesystem{ ext4 } \
+ mountpoint{ /srv } \
+ .
+
+# Parameters are:
+# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
+# <devices> <sparedevices>
+d-i partman-auto-raid/recipe string \
+ 1 3 1 ext4 / \
+ /dev/sda1#/dev/sdb1#/dev/sdc1 \
+ . \
+ 1 3 0 swap - \
+ /dev/sda2#/dev/sdb2#/dev/sdc2 \
+ . \
+ 0 3 0 lvm - \
+ /dev/sda3#/dev/sdb3#/dev/sdc3 \
+ .
+
+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
--
To view, visit https://gerrit.wikimedia.org/r/250649
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2ee9c150968d3d222c8247972018af7c7d5f3ae
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits