Ottomata has submitted this change and it was merged.
Change subject: Add netboot MACs and partman recipe for druid hosts
......................................................................
Add netboot MACs and partman recipe for druid hosts
druid1003's mgmt is not currently responding. Will add MAC for it when I can
get it.
Bug: T134275
Change-Id: I3359fc5f3e1b6466ec782692f06bf6238000c4d1
---
M modules/install_server/files/autoinstall/netboot.cfg
A modules/install_server/files/autoinstall/partman/druid-4ssd-raid10.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 84 insertions(+), 0 deletions(-)
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 1c1c4b8..9812132 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -69,6 +69,7 @@
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]01[1-9])
echo partman/db.cfg ;; \
d-i-test) echo partman/cassandrahosts-12hdd.cfg ;; \
+ druid100[123]) echo partman/druid-4ssd-raid10.cfg ;; \
eeden|bast3001|maerlant|multatuli|nescio) echo
partman/raid1-1partition.cfg ;; \
elastic10[0-2][0-9]|elastic103[0-1]) echo
partman/elasticsearch-raid0.cfg ;; \
elastic103[2-9]|elastic104[0-9]|elastic20[0-2][0-9]|elastic203[0-1])
echo partman/elasticsearch-raid1.cfg ;; \
diff --git
a/modules/install_server/files/autoinstall/partman/druid-4ssd-raid10.cfg
b/modules/install_server/files/autoinstall/partman/druid-4ssd-raid10.cfg
new file mode 100644
index 0000000..04de011
--- /dev/null
+++ b/modules/install_server/files/autoinstall/partman/druid-4ssd-raid10.cfg
@@ -0,0 +1,69 @@
+# Automatic software RAID partitioning
+#
+# * 4 SSD, sda, sdb, sdc, sdd
+# * LVM
+# * layout:
+# - /: RAID1, 30G, ext4
+# - swap: RAID1, 1G, swap
+# - /var/lib/druid: RAID10, LVM, ext4
+
+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
+d-i partman/alignment select optimal
+
+d-i partman-auto/disk string /dev/sda /dev/sdb /dev/sdc /dev/sdd
+d-i partman-auto/choose_recipe select raid1-root
+
+# Define physical partitions
+d-i partman-auto/expert_recipe string \
+ raid1-root :: \
+ 30000 1 30000 raid \
+ $primary{ } method{ raid } \
+ $lvmignore{ } \
+ . \
+ 1000 2 1000 raid \
+ $primary{ } method{ raid } \
+ $lvmignore{ } \
+ . \
+ 100000 3 -1 raid \
+ $primary{ } method{ raid } \
+ $lvmignore{ } \
+ . \
+ 100000 4 -1 ext4 \
+ $lvmok{ } \
+ $defaultignore{ } \
+ lv_name{ var } \
+ method{ format } \
+ format{ } \
+ use_filesystem{ } \
+ filesystem{ ext4 } \
+ mountpoint{ /var/lib/druid } \
+ .
+
+# Parameters are:
+# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
+# <devices> <sparedevices>
+d-i partman-auto-raid/recipe string \
+ 1 4 2 ext4 / \
+ /dev/sda1#/dev/sdb1#/dev/sdc1#/dev/sdd1 \
+ . \
+ 1 4 0 swap - \
+ /dev/sda2#/dev/sdb2#/dev/sdc2#/dev/sdd2 \
+ . \
+ 10 4 0 lvm - \
+ /dev/sda3#/dev/sdb3#/dev/sdc3#/dev/sdd3 \
+ .
+
+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 90%
+d-i partman-lvm/confirm boolean true
+d-i partman-lvm/confirm_nooverwrite boolean true
+d-i partman-lvm/device_remove_lvm boolean true
+d-i mdadm/boot_degraded boolean 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 9499037..bf4711e 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2004,6 +2004,20 @@
filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
+host druid1001 {
+ hardware ethernet 1C:98:EC:29:E2:98;
+ fixed-address druid1001.eqiad.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
+}
+
+host druid1002 {
+ hardware ethernet 14:02:EC:06:8B:EC;
+ fixed-address druid1002.eqiad.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
+}
+
host eeden {
hardware ethernet a4:ba:db:30:d8:80;
fixed-address eeden.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/290944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3359fc5f3e1b6466ec782692f06bf6238000c4d1
Gerrit-PatchSet: 3
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
