Elukey has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/378902 )

Change subject: install_server: add partman recipe for new mw hosts
......................................................................


install_server: add partman recipe for new mw hosts

Bug: T165519
Change-Id: Ibc3b843b32eb3e993ba9da10621fc6ec7aa3264f
---
M modules/install_server/files/autoinstall/netboot.cfg
A modules/install_server/files/autoinstall/partman/mw-raid1-lvm.cfg
2 files changed, 79 insertions(+), 1 deletion(-)

Approvals:
  Elukey: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 1588d63..d46f146 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -132,7 +132,7 @@
         mw211[89]|mw2152|mw2246) echo partman/mw-no-tmp.cfg ;; \
         mw1259) echo partman/mw-raid1.cfg ;; \
         mw12[6-9][0-9]) echo partman/mw-raid1.cfg ;; \
-        mw13*) echo partman/mw-raid1.cfg ;; \
+        mw13*) echo partman/mw-raid1-lvm.cfg ;; \
         mw22*) echo partman/mw-raid1.cfg ;; \
         osmium) echo partman/mw-raid1.cfg ;; \
         mw[0-9]*) echo partman/mw.cfg ;; \
diff --git a/modules/install_server/files/autoinstall/partman/mw-raid1-lvm.cfg 
b/modules/install_server/files/autoinstall/partman/mw-raid1-lvm.cfg
new file mode 100644
index 0000000..1bd1bf2
--- /dev/null
+++ b/modules/install_server/files/autoinstall/partman/mw-raid1-lvm.cfg
@@ -0,0 +1,78 @@
+# Automatic software RAID 1 with LVM partitioning
+#
+# * two disks, sda & sdb
+# * layout:
+#   - /        :   ext4, RAID1/LVM, max 800GB
+#   - /boot: ext4, RAID1, 10GB
+#   - placeholder logical volume - RAID1/LVM - rest of the space
+
+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
+
+# Use the first two disks
+d-i    partman-auto/disk       string  /dev/sda /dev/sdb
+
+# Define physical partitions
+d-i    partman-auto/expert_recipe      string  \
+               multiraid ::    \
+
+               1000    1000    -1      raid            \
+                       $primary{ } method{ raid }      \
+                       $lvmignore{ }                   \
+               .                                       \
+               5000 5000 5000 ext4                             \
+                       $primary{ }                                     \
+                       $bootable{ }                            \
+                       method{ format }                        \
+                       format{ }                                       \
+                       use_filesystem{ }                       \
+                       filesystem{ ext4 }                      \
+                       mountpoint{ /boot }                     \
+               .                                                               
\
+               400000000 50000 800000000 ext4          \
+                       $primary{ }             \
+                       method{ format }        \
+                       format{ }               \
+                       use_filesystem{ }       \
+                       filesystem{ ext4 }      \
+                       lv_name{ root}          \
+                       $defaultignore{ }       \
+                       $lvmok{ }               \
+                       mountpoint{ / } \
+               .
+               64 1000 200000000 ext4          \
+                       $primary{ }             \
+                       method{ format }        \
+                       format{ }               \
+                       use_filesystem{ }       \
+                       filesystem{ ext4 }      \
+                       lv_name{ placeholder }  \
+                       $defaultignore{ }       \
+                       $lvmok{ }               \
+               .
+
+
+# Parameters are:
+# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
+#      <devices> <sparedevices>
+d-i    partman-auto-raid/recipe        string          \
+               1       2       0       raid    /       \
+                       /dev/sda1#/dev/sdb1             \
+               .       \
+               1       2       0       lvm             /       \
+                       /dev/sda2#/dev/sdb2             \
+               .
+
+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
+partman-basicfilesystems partman-basicfilesystems/no_swap boolean false
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc3b843b32eb3e993ba9da10621fc6ec7aa3264f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@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