RobH has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376152 )
Change subject: updating labstore100[67] partman recipe
......................................................................
updating labstore100[67] partman recipe
with the fix of the hw raid, these systems can use the normal partman
recipe
Bug: T167984
Change-Id: I0b574cb14bfe7d53c69f64d553d71d6f68f5d302
---
M modules/install_server/files/autoinstall/netboot.cfg
D
modules/install_server/files/autoinstall/partman/labstore100X-hwraid-flexdisks.cfg
2 files changed, 1 insertion(+), 69 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/52/376152/1
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index e13adc8..cfa827f 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -70,7 +70,7 @@
db[0-8][0-9]|db10[0-8][0-9]|db109[0-5]|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-no-srv-format.cfg ;; \
d-i-test) echo partman/flat.cfg virtual.cfg ;; \
druid100[1-6]) echo partman/druid-4ssd-raid10.cfg ;; \
- dumpsdata100[12]) echo partman/dumpsdata100X.cfg ;; \
+ dumpsdata100[12]|labstore100[67]) 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 ;; \
elastic103[2-9]|elastic104[0-9]|elastic105[0-2]) echo
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
@@ -101,7 +101,6 @@
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
deleted file mode 100644
index 9feb3a4..0000000
---
a/modules/install_server/files/autoinstall/partman/labstore100X-hwraid-flexdisks.cfg
+++ /dev/null
@@ -1,67 +0,0 @@
-# Configuration to create:
-# Hardware RAID1 on 2 SFF drives in flex bays mounted at /dev/sdb
-# 1G on /boot outside of LVM
-# LVM volume of 95% remainder of sda is /
-# Hardware RAID10 on 12 LFF 6TB SATA disks mounted at /dev/sdc
-# 95% of sdb allocated as /data
-# There is a hw raid10 of 12 LFF 6TB disks as /dev/sda, 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 SDB and SDC
-d-i partman-auto/method string lvm
-d-i partman-auto/disk string /dev/sdb /dev/sdc
-
-# 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/sdb } \
-
- . \
-# 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/sdb } \
- . \
-# 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/sdc } \
-
-
- .
-
-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
-
-d-i grub-installer/bootdev string /dev/sdb
-
-
-partman-basicfilesystems partman-basicfilesystems/no_swap boolean false
-
-
--
To view, visit https://gerrit.wikimedia.org/r/376152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b574cb14bfe7d53c69f64d553d71d6f68f5d302
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
