Ottomata has submitted this change and it was merged.

Change subject: Add raid1-lvm-conf.cfg to test partman recipe for new conf 
(zookeeper/etcd) nodes
......................................................................


Add raid1-lvm-conf.cfg to test partman recipe for new conf (zookeeper/etcd) 
nodes

Change-Id: I3e8341b946021cf895a8a09701f18236038e04d9
---
M modules/install-server/files/autoinstall/netboot.cfg
A modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
2 files changed, 90 insertions(+), 1 deletion(-)

Approvals:
  Ottomata: 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 baa3cb4..5201928 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -62,7 +62,7 @@
                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 ;; \
                
db[0-8][0-9]|db10[0-7][0-9]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]0[0-2][0-9])
 echo partman/db.cfg ;; \
-               d-i-test) echo partman/flat.cfg ;; \
+               d-i-test) echo partman/raid1-lvm-conf.cfg ;; \
                eeden|hooft|maerlant|multatuli|nescio) echo 
partman/raid1-1partition.cfg ;; \
                einsteinium) echo partman/raid1-lvm-ext4.cfg;; \
                elastic10[0-2][0-9]|elastic103[0-1]) echo 
partman/elasticsearch.cfg ;; \
diff --git 
a/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg 
b/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
new file mode 100644
index 0000000..08a5be4
--- /dev/null
+++ b/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
@@ -0,0 +1,89 @@
+# Automatic software RAID 1 with LVM partitioning.
+# / is 30GB on /dev/md0.
+# /dev/md1 fills up rest of disk, and a single LVM volume group is created on 
it.
+#   swap is 8GB on an LV
+#   /var is a 60G LV
+#   /var/lib/zookeeper is a 250G LV
+#   /var/lib/etcd is a 250G LV
+
+d-i    partman-auto/method     string  raid
+# 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 ::    \
+               5000 8000 30000 raid \
+                       method{ raid } \
+                       $primary{ } \
+                       $lvmignore{ } \
+               . \
+               64 8000 1000000 raid \
+                       method{ raid }  \
+                       $primary{ } \
+                       $lvmignore{ } \
+               . \
+               1000 1000 8000 linux-swap \
+                       method{ swap } \
+                       format{ } \
+                       $lvmok{ } \
+                       lv_name{ swap } \
+                       $defaultignore{ } \
+               . \
+               1000 1000 60000 ext4 \
+                       mountpoint{ /var } \
+                       method{ format } \
+                       $primary{ } \
+                       format{ } \
+                       $lvmok{ } \
+                       lv_name{ zookeeper } \
+                       use_filesystem{ } \
+                       filesystem{ ext4 } \
+                       $defaultignore{ } \
+               . \
+               1000 2000 250000 xfs \
+                       mountpoint{ /var/lib/zookeeper } \
+                       method{ format } \
+                       $primary{ } \
+                       format{ } \
+                       $lvmok{ } \
+                       lv_name{ zookeeper } \
+                       use_filesystem{ } \
+                       filesystem{ xfs } \
+                       $defaultignore{ } \
+               . \
+               1000 2000 250000 ext4 \
+                       mountpoint{ /var/lib/etcd } \
+                       method{ format } \
+                       $primary{ } \
+                       format{ } \
+                       $lvmok{ } \
+                       lv_name{ etcd } \
+                       use_filesystem{ } \
+                       filesystem{ ext4 } \
+                       $defaultignore{ } \
+               .
+
+# Parameters are:
+# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
+#          <devices> <sparedevices>
+d-i    partman-auto-raid/recipe        string  \
+               1       2       0       ext4    /       /dev/sda1#/dev/sdb1     
\
+               .       \
+               1       2       0       lvm     -       /dev/sda2#/dev/sdb2     
\
+               .
+
+d-i    partman-md/confirm      boolean true
+d-i    partman-md/device_remove_md     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     true
+
+d-i    partman-auto-lvm/guided_size    string  80%
+
+# the install makes sure we want to wipe the lvm
+d-i    partman-lvm/device_remove_lvm   boolean true
+d-i    partman-lvm/confirm     boolean true
+d-i    partman-lvm/confirm_nooverwrite true
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3e8341b946021cf895a8a09701f18236038e04d9
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@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