EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371210 )

Change subject: Switch elastic1017 to LVM
......................................................................

Switch elastic1017 to LVM

Attempt to remove differences of IO between elastic1017-31 and 1032-1054
by switching to a configuration that is very close to what the later
servers are using. This only varies in that the root partition is shrunk
from 50GB to 25GB (current servers use ~5GB) and the raid1 on /srv was
changed to raid0 because 1017-31 have 2x300GB disks, rather than
the 2x800G you find on 1032-1054.

Bug: T169498
Change-Id: I521da744bcb25b8ff264d2b450a02d1dae2d4799
---
M modules/install_server/files/autoinstall/netboot.cfg
A modules/install_server/files/autoinstall/partman/raid0-lvm-ext4-srv-noswap.cfg
2 files changed, 63 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/371210/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 1081837..6dfb4f5 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -72,7 +72,8 @@
         druid100[1-6]) echo partman/druid-4ssd-raid10.cfg ;; \
         dumpsdata100[12]) echo partman/dumpsdata100X.cfg ;; \
         eeden|maerlant|multatuli|nescio) echo partman/raid1-1partition.cfg ;; \
-        elastic101[7-9]|elastic102[0-9]|elastic103[0-1]) echo 
partman/elasticsearch-raid0.cfg ;; \
+        elastic1017) echo partman/raid0-lvm-ext4-srv-noswap.cfg ;; \
+        elastic101[8-9]|elastic102[0-9]|elastic103[0-1]) echo 
partman/elasticsearch-raid0.cfg ;; \
         elastic103[2-9]|elastic104[0-9]|elastic105[0-2]) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
         elastic20[0-2][0-9]|elastic203[0-6]) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
         
labcontrol100[34]|labmon1001|mwlog[12]001|relforge100[12]|scb200[1-6]|stat100[56])
 echo partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
diff --git 
a/modules/install_server/files/autoinstall/partman/raid0-lvm-ext4-srv-noswap.cfg
 
b/modules/install_server/files/autoinstall/partman/raid0-lvm-ext4-srv-noswap.cfg
new file mode 100644
index 0000000..616a83a
--- /dev/null
+++ 
b/modules/install_server/files/autoinstall/partman/raid0-lvm-ext4-srv-noswap.cfg
@@ -0,0 +1,61 @@
+# Automatic software RAID 1 with LVM partitioning
+#
+# * two disks, sda & sdb
+# * layout:
+#   - /        :   ext4, RAID1, 25GB
+#   - /srv: ext4, RAID0/LVM, up to 80% of the total space
+#   - free space for the rest under RAID0/LVM
+
+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 ::    \
+                       2500    8000    25000   raid            \
+                               $primary{ } method{ raid }      \
+                               $lvmignore{ }                   \
+                       .                                       \
+                       1000    1000    -1      raid            \
+                               $primary{ } method{ raid }      \
+                               $lvmignore{ }                   \
+                       .                                       \
+                       64 1000 10000000 ext4           \
+                               $primary{ }             \
+                               method{ format }        \
+                               format{ }               \
+                               use_filesystem{ }       \
+                               filesystem{ ext4 }      \
+                               lv_name{ data }         \
+                               $defaultignore{ }       \
+                               $lvmok{ }               \
+                               mountpoint{ /srv }      \
+               .
+
+
+# Parameters are:
+# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
+#      <devices> <sparedevices>
+d-i    partman-auto-raid/recipe        string          \
+               1       2       0       ext4    /       \
+                       /dev/sda1#/dev/sdb1             \
+               .                                       \
+               0       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/371210
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I521da744bcb25b8ff264d2b450a02d1dae2d4799
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to