Filippo Giunchedi has submitted this change and it was merged.

Change subject: install-server: partman for dm-cache
......................................................................


install-server: partman for dm-cache

this partman recipe provides LVM over two hardware raid (ssd and hdd) to be
used with dm-cache for hybrid caching, see also T88992

Bug: T88994
Change-Id: If14f2dc0fd84347d362e7a958593d34b68b3cb5c
---
M modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg
1 file changed, 45 insertions(+), 18 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved
  Faidon Liambotis: Looks good to me, but someone else must approve



diff --git 
a/modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg 
b/modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg
index 83b1d74..8e896b9 100644
--- a/modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg
+++ b/modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg
@@ -1,25 +1,30 @@
-# Automatic software RAID 10 with LVM partitioning
-# test dm-cache T88992
-#
+# use LVM and dm-cache to speed up read/write to spinning HDDs
+
+# expected hardware:
 # * /dev/sda: db-class hw-raid10 spinning disks 1.7TB
 # * /dev/sdb: hw-raid raid1 SSD 256GB
 
 # * layout:
 #   - /boot: ext4 on ssd, no lvm
-#   - two VG: data (hdd+ssd) and system (ssd)
+#   - two VGs: vg-data (PV: sda+sdb) and vg-sys (PV: sdb)
 #   - swap: vg-sys 1GB
-#   - /: vg-sys 20GB
+#   - /: vg-sys 30GB
 
 d-i    partman-auto/method             string  lvm
 d-i    partman-md/device_remove_md     boolean true
 d-i    partman-lvm/device_remove_lvm   boolean true
 
-d-i    partman-auto/disk       string  /dev/sda /dev/sdb
+# order is important, if not specified partitions get created on the first disk
+d-i    partman-auto/disk       string  /dev/sdb /dev/sda
+
+d-i    partman-auto/choose_recipe      lvm
 
 # Define physical partitions
+# regular partitions and partitions used in VGs first
+# then LVs
 d-i    partman-auto/expert_recipe      string  \
-               multiraid ::    \
-               40 300 300 ext3                 \
+               lvm ::  \
+               100 300 100 ext4                        \
                        $primary{ }             \
                        $bootable{ }            \
                        method{ format }        \
@@ -29,12 +34,32 @@
                        mountpoint{ /boot }     \
                        device{ /dev/sdb }      \
                .                               \
-               1000 8000 1000 linux-swap       \
+               40000 40000 40000 ext4                  \
+                       $defaultignore{ }               \
+                       $primary{ }             \
+                       method{ lvm }   \
+                       device{ /dev/sdb }      \
+                       vg_name{ vg-sys }       \
+               .                               \
+               100000 300000 1000000000 ext4           \
+                       $primary{ }             \
+                       $defaultignore{ }               \
+                       method{ keep }  \
+                       device{ /dev/sdb }      \
+               .                               \
+               500000 300 -1 ext4                      \
+                       $defaultignore{ }               \
+                       $primary{ }             \
+                       method{ lvm }   \
+                       device{ /dev/sda }      \
+                       vg_name{ vg-data }      \
+               .                               \
+               1000 1000 1000 linux-swap       \
                        method{ swap }          \
                        $lvmok{ }               \
                        format{ }               \
-                       device{ /dev/sdb }              \
-                       vg_name{ vg-sys }               \
+                       in_vg{ vg-sys }         \
+                       lv_name{ swap }         \
                .                               \
                30000 30000 30000 ext4          \
                        $lvmok{ }               \
@@ -43,20 +68,19 @@
                        use_filesystem{ }       \
                        filesystem{ ext4 }      \
                        mountpoint{ / }         \
-                       device{ /dev/sdb }      \
-                       vg_name{ vg-sys }       \
-               100000 30000 -1 ext4            \
-                       method{ keep }  \
-                       device{ /dev/sdb }      \
-               500000 30000 -1 ext4            \
+                       in_vg{ vg-sys }         \
+                       lv_name{ root }         \
+               .                               \
+               500000 500000 -1 ext4           \
                        $lvmok{ }               \
                        method{ format }        \
                        format{ }               \
                        use_filesystem{ }       \
                        filesystem{ ext4 }      \
                        mountpoint{ /var/lib/carbon }   \
+                       in_vg{ vg-data }        \
+                       lv_name{ graphite }     \
                        device{ /dev/sda }      \
-                       vg_name{ vg-data }      \
                .
 
 d-i    partman-md/confirm              boolean true
@@ -69,3 +93,6 @@
 d-i    partman-auto-lvm/guided_size    string  80%
 d-i    partman-lvm/confirm             boolean true
 d-i    partman-lvm/confirm_nooverwrite boolean true
+
+# do not prompt for 'no filesystem on partition'
+d-i    partman-basicmethods/method_only        boolean false

-- 
To view, visit https://gerrit.wikimedia.org/r/200134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If14f2dc0fd84347d362e7a958593d34b68b3cb5c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@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

Reply via email to