Giuseppe Lavagetto has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225848

Change subject: wdqs: install as jessie, add partman recipe
......................................................................

wdqs: install as jessie, add partman recipe

Bug: T86561
Change-Id: I18b042161c4e74d5e669f9d2e9b25febac0418f9
---
M modules/install_server/files/autoinstall/netboot.cfg
A modules/install_server/files/autoinstall/partman/raid1-lvm-wdqs.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 84 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/225848/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 038dfd9..c2fe992 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -107,6 +107,7 @@
                stat1002) echo partman/lvm-noraid-large.a.cfg ;; \
                virt100[1-9]) echo partman/virt-raid10-cisco.cfg ;; \
                virt101[0-2]) echo partman/virt-hp.cfg ;; \
+        wdqs100[1-9]) echo partman/raid1-lvm-wdqs.cfg ;; \
                wtp[1-2]0[0-2][0-9]|hafnium) echo partman/raid1-lvm.cfg ;; \
 #              sodium) echo partman/mailserver.cfg ;; \
        esac
diff --git 
a/modules/install_server/files/autoinstall/partman/raid1-lvm-wdqs.cfg 
b/modules/install_server/files/autoinstall/partman/raid1-lvm-wdqs.cfg
new file mode 100644
index 0000000..ee9ebbd
--- /dev/null
+++ b/modules/install_server/files/autoinstall/partman/raid1-lvm-wdqs.cfg
@@ -0,0 +1,77 @@
+# Partman recipe for wdqs100x servers (etcd & zookeeper)
+#
+# Automatic software RAID 1 with LVM partitioning.
+# / is 30G on /dev/md0.
+# /dev/md1 fills up 1T of sda2 and sdb2, and a single LVM volume group is 
created on it.
+#   /var/lib/wdqs is a 200G LV
+#   _placeholder is an LV that fills up the rest of space.
+#     This is a hack to keep the wdqs partition from using up all free space.
+#
+# NOTE:  Partition priorities were calculated after reading
+#        
http://www.bishnet.net/tim/blog/2015/01/29/understanding-partman-autoexpert_recipe/
+#        sum(priority - minimum) == 100%
+
+# Use the first 2 disks for RAID1
+d-i partman-auto/method  string  raid
+d-i partman-auto/disk    string  /dev/sda /dev/sdb
+
+# Configure 2 RAID 1 devices:
+#   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-auto/expert_recipe string multiraid :: \
+    5000 8000 30000 raid \
+        method{ raid } \
+        $primary{ } \
+        $bootable{ } \
+        $lvmignore{ } \
+    . \
+    64 8000 1000000 raid \
+        method{ raid } \
+        $primary{ } \
+        $lvmignore{ } \
+    . \
+    1000 1025 250000 ext4 \
+        mountpoint{ /var/lib/wdqs } \
+        method{ format } \
+        $primary{ } \
+        format{ } \
+        $lvmok{ } \
+        lv_name{ etcd } \
+        use_filesystem{ } \
+        filesystem{ ext4 } \
+        $defaultignore{ } \
+    . \
+    1000 1043 -1 ext4 \
+        method{ format } \
+        $primary{ } \
+        format{ }
+        $lvmok{ } \
+        lv_name{ _placeholder } \
+        use_filesystem{ } \
+        filesystem{ ext4 } \
+        $defaultignore{ } \
+    .
+
+
+d-i partman-md/confirm              boolean     true
+d-i partman-md/device_remove_md     boolean     true
+d-i partman-md/confirm_nochanges    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                 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
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 31c07ad..3a96e29 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5878,12 +5878,16 @@
 
 host wdqs1001 {
        hardware ethernet 90:b1:1c:1d:e7:e6;
-    fixed-address wdqs1001.eqiad.wmnet;
+       fixed-address wdqs1001.eqiad.wmnet;
+       option pxelinux.pathprefix "jessie-installer/";
+       filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host wdqs1002 {
        hardware ethernet 90:b1:1c:23:36:1d;
-    fixed-address wdqs1002.eqiad.wmnet;
+       fixed-address wdqs1002.eqiad.wmnet;
+       option pxelinux.pathprefix "jessie-installer/";
+       filename "jessie-installer/debian-installer/amd64/pxelinux.0";    
 }
 
 host wtp1001 {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I18b042161c4e74d5e669f9d2e9b25febac0418f9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to