RobH has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/375079 )
Change subject: labstore100[67] install params
......................................................................
labstore100[67] install params
new install params for labstore100[67]. uses its own partman recipe due
to the disks presenting differently when there is both an internal and
external raid controller on these systems.
Bug: T167984
Change-Id: I481e8422a74481f485814ffbaac33c179f221e1f
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
A
modules/install_server/files/autoinstall/partman/labstore100X-hwraid-flexdisks.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
4 files changed, 82 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/79/375079/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 9dffe6a..bb4a2f4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1373,11 +1373,17 @@
include ::standard
}
-node /labstore100[45]\.eqiad\.wmnet/ {
role(labs::nfs::secondary)
include ::standard
}
+# new labstore nodes, set to spare until pushed into service T167984
+node /labstore100[67]\.eqiad\.wmnet/ {
+ role(spare::system)
+}
+
+
+
node /labstore200[1-2]\.codfw\.wmnet/ {
include ::standard
}
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 84542bc..f70fe77 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -101,6 +101,7 @@
sodium) echo partman/lvm-ext-srv.cfg ;; \
labpuppetmaster100[12]|labnet100[34]|labnodepool1002|labweb100[12])
echo partman/raid1-lvm-ext4-srv-noswap.cfg;; \
labstore100[1-2]) echo partman/labstore-lvm-noraid-swap.cfg ;; \
+ labstore100[67]) echo partman/labstore100X-hwraid-flexdisks.cfg ;; \
labstore200[1-4]) echo partman/labstore-lvm-noraid.cfg ;; \
labtestneutron2001) echo partman/mw.cfg ;; \
labtestnet2001) echo partman/raid1.cfg ;; \
diff --git
a/modules/install_server/files/autoinstall/partman/labstore100X-hwraid-flexdisks.cfg
b/modules/install_server/files/autoinstall/partman/labstore100X-hwraid-flexdisks.cfg
new file mode 100644
index 0000000..f124b42
--- /dev/null
+++
b/modules/install_server/files/autoinstall/partman/labstore100X-hwraid-flexdisks.cfg
@@ -0,0 +1,64 @@
+# Configuration to create:
+# Hardware RAID1 on 2 SFF drives in flex bays mounted at /dev/sde
+# 1G on /boot outside of LVM
+# LVM volume of 95% remainder of sda is /
+# Hardware RAID10 on 12 LFF 4TB SATA disks mounted at /dev/sdf
+# 95% of sdb allocated as /data
+# There is a hw raid10 of 12 LFF 6TB disks as /dev/sdd, but this recipe
doesn't touch it.
+
+# remove any LVM already on the disks
+d-i partman-lvm/device_remove_lvm boolean true
+
+# We'll be creating LVMs and partitioning disks SDE and SDF
+d-i partman-auto/method string lvm
+d-i partman-auto/disk string /dev/sde /dev/sdf
+
+# setup a /boot partition of 1GB outside of the LVM
+d-i partman-auto/expert_recipe string lvm :: \
+ 1000 2000 1000 ext4 \
+ $primary{ } \
+ $bootable{ } \
+ method{ format } \
+ format{ } \
+ use_filesystem{ } \
+ filesystem{ ext4 } \
+ mountpoint{ /boot } \
+ device { /dev/sde } \
+
+ . \
+# setup the / filesystem within the LVM filling the 90% of the remaining space
+ 80000 1000 -1 ext4 \
+ method{ format } \
+ format{ } \
+ use_filesystem{ } \
+ filesystem{ ext4 } \
+ lv_name{ root } \
+ $defaultignore{ } \
+ $lvmok{ } \
+ mountpoint{ / } \
+ device { /dev/sde } \
+ . \
+# setup the SDB disk with a single LVM at 90% of the disk, and a mount in ext4
for /data
+ 100000 1000 -1 ext4 \
+ method{ format } \
+ format{ } \
+ use_filesystem{ } \
+ filesystem{ ext4 } \
+ lv_name{ data } \
+ $defaultignore{ } \
+ $lvmok{ } \
+ mountpoint{ /data } \
+ device { /dev/sdf } \
+
+
+ .
+
+d-i partman-auto-lvm/guided_size string 95%
+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
+
+partman-basicfilesystems partman-basicfilesystems/no_swap boolean false
+
+
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 75a5070..73111f9 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2790,6 +2790,16 @@
fixed-address labstore1005.eqiad.wmnet;
}
+host labstore1006 {
+ hardware ethernet 30:e1:71:5d:72:bc;
+ fixed-address labstore1006.wikimedia.org;
+}
+
+host labstore1007 {
+ hardware ethernet 30:e1:71:5f:9d:94;
+ fixed-address labstore1007.wikimedia.org;
+}
+
host labstore2001 {
hardware ethernet 78:2b:cb:76:1c:d2;
fixed-address labstore2001.codfw.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/375079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I481e8422a74481f485814ffbaac33c179f221e1f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <r...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
