Filippo Giunchedi has submitted this change and it was merged.
Change subject: restbase: switch to new partitioning scheme
......................................................................
restbase: switch to new partitioning scheme
Bug: T76986
Change-Id: Icbf4baa40cb3b48eda11f1adc0149963fb4e69d6
---
M modules/install-server/files/autoinstall/netboot.cfg
M modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
2 files changed, 31 insertions(+), 28 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Alexandros Kosiaris: Looks good to me, approved
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index b51dd12..6e0efeb 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -89,6 +89,7 @@
stat1002) echo partman/lvm-noraid-large.a.cfg ;; \
argon|bast4001|copper|neon|ruthenium|titanium|ytterbium|zirconium) echo
partman/raid1-lvm.cfg ;; \
cerium|praseodymium|xenon) echo partman/cassandrahosts.cfg ;; \
+ restbase1*) echo partman/cassandrahosts.cfg ;; \
virt100[1-9]) echo partman/virt-raid10-cisco.cfg ;; \
virt101[0-2]) echo partman/virt-hp.cfg ;; \
labnet1001) echo partman/lvm.cfg ;; \
diff --git
a/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
b/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
index 70a86c5..c18106a 100644
--- a/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
+++ b/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
@@ -1,49 +1,48 @@
# Automatic software RAID partitioning
#
-# * 4 disks, sda, sdb, sdc, sdd
-# * 2 Spinning disks sda/sdb, 2 SSDs sdc/sdd
+# * 3 SSD, sda, sdb, sdc
# * LVM
# * layout:
-# - /boot: RAID1, 500MB on spinning disks
-# - / : ext3, RAID1, 50GB on LVM on spinning disks
-# - swap: RAID1, 1G on LVM on spinning disks
-# - rest is lvm RAID1, on spinning disks
-# - SSDs to be manually partitioned after installation
+# - /: 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
-# Use the first two disks
-d-i partman-auto/disk string /dev/sda /dev/sdb
-d-i partman-auto/choose_recipe select raid1-boot-root
+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-boot-root :: \
- 500 1 500 raid \
+ raid1-root :: \
+ 30000 1 30000 raid \
+ $primary{ } method{ raid } \
+ $lvmignore{ } \
+ format{ } \
+ use_filesystem{ } \
+ filesystem{ ext4 } \
+ mountpoint{ / } \
+ . \
+ 500 3 -1 raid \
$primary{ } method{ raid } \
$lvmignore{ } \
. \
- 500 2 -1 raid \
- $primary{ } method{ raid } \
- $lvmignore{ } \
- . \
- 50000 4 50000 ext3 \
+ 500000 4 -1 ext4 \
$lvmok{ } \
$defaultignore{ } \
- lv_name{ root } \
+ lv_name{ var } \
method{ format } \
format{ } \
use_filesystem{ } \
- filesystem{ ext3 } \
- mountpoint{ / } \
+ filesystem{ ext4 } \
+ mountpoint{ /var } \
. \
- 1000 3 1000 linux-swap \
- $defaultignore{ } \
- $lvmok{ } \
- lv_name{ swap } \
+ 1000 2 1000 raid \
+ $primary{ } method{ raid } \
+ $lvmignore{ } \
method{ swap } \
format{ } \
.
@@ -52,11 +51,14 @@
# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
# <devices> <sparedevices>
d-i partman-auto-raid/recipe string \
- 1 2 0 ext3 /boot \
- /dev/sda1#/dev/sdb1 \
+ 1 3 1 ext4 / \
+ /dev/sda1#/dev/sdb1#/dev/sdc1 \
. \
- 1 2 0 lvm - \
- /dev/sda2#/dev/sdb2 \
+ 1 3 1 linux-swap none \
+ /dev/sda2#/dev/sdb2#/dev/sdc2 \
+ . \
+ 0 3 0 lvm - \
+ /dev/sda3#/dev/sdb3#/dev/sdc3 \
.
d-i partman-md/confirm boolean true
--
To view, visit https://gerrit.wikimedia.org/r/190182
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icbf4baa40cb3b48eda11f1adc0149963fb4e69d6
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
