Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87354
Change subject: partman: add a new layout for ms-be @ eqiad
......................................................................
partman: add a new layout for ms-be @ eqiad
Instead of moving disks 13 & 14 (SSDs) to logical disks 0 & 1 (sda & sdb) and
having the rest offset by 2, make the setup as easy as an exact mapping
between PD & LD. This will hopefully help us identify disks more easily
and, in the short term, allows us to configure via megacli
-CfgEachDskRaid0 WB RA Direct CachedBadBBU -a0
Create a new profile for this, as it'd be best to not have Swift @ pmtpa
be non-homogeneous.
While at it:
- Point ms-be30xx to ceph-ssd.cfg and make the profile referenced
again. Useful in case we want to revive Ceph in those boxes.
- Drop virt-raid10-cisco-ceph.cfg altogether. Unused, deprecated,
clutter.
Change-Id: Id0df94c8e0281b59580529398ec1469a101d3ec5
---
M files/autoinstall/netboot.cfg
A files/autoinstall/partman/ms-be-eqiad.cfg
D files/autoinstall/partman/virt-raid10-cisco-ceph.cfg
3 files changed, 60 insertions(+), 50 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/87354/1
diff --git a/files/autoinstall/netboot.cfg b/files/autoinstall/netboot.cfg
index a3c8e27..f3ab1c5 100755
--- a/files/autoinstall/netboot.cfg
+++ b/files/autoinstall/netboot.cfg
@@ -56,8 +56,9 @@
ms-fe[1-4]) echo partman/raid1-1partition.cfg ;; \
ms-be[1-9]|ms-be1[0-2]) echo partman/ms-be-ssd.cfg ;; \
ms-fe10[0-9][0-9]) echo partman/raid1-1partition.cfg ;; \
- ms-be10[0-9][0-9]) echo partman/ms-be-ssd.cfg ;; \
- ms-be30[0-9][0-9]) echo partman/raid1-varnish.cfg ;; \
+ ms-be10[0-9][0-9]) echo partman/ms-be-eqiad.cfg ;; \
+ ms-fe30[0-9][0-9]) echo partman/raid1-1partition.cfg ;; \
+ ms-be30[0-9][0-9]) echo partman/ceph-ssd.cfg ;; \
labsdb[1-3]|mw[0-9]*|srv[0-9]*|bast*) echo partman/mw.cfg ;; \
labsdb100[1-3]) echo partman/mw.cfg ;; \
nickel) echo partman/raid1.cfg ;; \
diff --git a/files/autoinstall/partman/ms-be-eqiad.cfg
b/files/autoinstall/partman/ms-be-eqiad.cfg
new file mode 100644
index 0000000..6597b9d
--- /dev/null
+++ b/files/autoinstall/partman/ms-be-eqiad.cfg
@@ -0,0 +1,57 @@
+# Automatic software RAID partitioning
+#
+# * two disks, sdm & sdn (720xd internal bays, SSDs)
+# * primary partitions, no LVM
+# * layout:
+# - / : ext3, RAID1, 60GB
+# - swap: RAID1, 1GB
+# - the rest of each respective disk (no RAID) formatted as xfs, unmounted
+
+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-auto/disk string /dev/sdm /dev/sdn
+d-i grub-installer/bootdev string /dev/sdm /dev/sdn
+
+# this workarounds LP #1012629 / Debian #666974
+# it makes grub-installer to jump to step 2, where it uses bootdev
+d-i grub-installer/only_debian boolean false
+
+# Define physical partitions
+d-i partman-auto/expert_recipe string \
+ multiraid :: \
+ 60000 8000 60000 raid \
+ $primary{ } method{ raid } \
+ . \
+ 1000 1000 1000 raid \
+ $primary{ } method{ raid } \
+ . \
+ 100 500 -1 xfs \
+ $primary{ } method{ format } \
+ format{ } use_filesystem{ } \
+ filesystem{ xfs } \
+ .
+
+# Parameters are:
+# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
+# <devices> <sparedevices>
+d-i partman-auto-raid/recipe string \
+ 1 2 0 ext3 / \
+ /dev/sdm1#/dev/sdn1 \
+ . \
+ 1 2 0 swap - \
+ /dev/sdm2#/dev/sdn2 \
+ .
+
+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
+
+# the first is for lucid, the second for precise (partman-xfs >= 45)
+d-i partman-xfs/no_mount_point boolean false
+d-i partman-basicfilesystems/no_mount_point boolean false
diff --git a/files/autoinstall/partman/virt-raid10-cisco-ceph.cfg
b/files/autoinstall/partman/virt-raid10-cisco-ceph.cfg
deleted file mode 100644
index 81ccd89..0000000
--- a/files/autoinstall/partman/virt-raid10-cisco-ceph.cfg
+++ /dev/null
@@ -1,48 +0,0 @@
-# Automatic software RAID partitioning
-
-# this is a *nasty** bug that results in an unbootable system
-# https://bugs.launchpad.net/ubuntu/+source/partman-auto-raid/+bug/591909/
-d-i partman/alignment select cylinder
-
-# these systems have tons of memory, do not warn about not having a swap
-# besides, md with swap failed, at least on lucid due to a bug
-d-i partman-basicfilesystems/no_swap boolean false
-
-d-i partman-auto/method string raid
-d-i partman-md/device_remove_md boolean true
-
-# Use the first six disks; leave the other two for later.
-d-i partman-auto/disk string /dev/sda /dev/sdb /dev/sdc /dev/sdd
/dev/sde /dev/sdf
-
-# Define physical partitions
-d-i partman-auto/expert_recipe string \
- multiraid :: \
- 5000 8000 10000 raid \
- $primary{ } method{ raid } \
- . \
- 10000 50000 -1 raid \
- $primary{ } method{ raid } \
- .
-
-# Parameters are:
-# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
-# <devices> <sparedevices>
-d-i partman-auto-raid/recipe string \
- 10 6 0 ext3 / \
-
/dev/sda1#/dev/sdb1#/dev/sdc1#/dev/sdd1#/dev/sde1#/dev/sdf1 \
- . \
- 10 6 0 xfs /srv \
-
/dev/sda2#/dev/sdb2#/dev/sdc2#/dev/sdd2#/dev/sde2#/dev/sdf2 \
- .
-
-d-i partman-md/confirm boolean true
-d-i partman-md/confirm_nooverwrite boolean true
-d-i partman-md/device_remove_md 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
-
-# the first is for lucid, the second for precise (partman-xfs >= 45)
-d-i partman-xfs/no_mount_point boolean false
-d-i partman-basicfilesystems/no_mount_point boolean false
--
To view, visit https://gerrit.wikimedia.org/r/87354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0df94c8e0281b59580529398ec1469a101d3ec5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
