Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119039
Change subject: Convert carbon to RAID5+LVM
......................................................................
Convert carbon to RAID5+LVM
Using LVM. Also fix some problems with the original configuration
Change-Id: Ibfb068c0d2a81f0005b0fadeb0a3da0c846972b2
---
M modules/install-server/files/autoinstall/netboot.cfg
M modules/install-server/files/autoinstall/partman/raid5-gpt-lvm.cfg
M modules/install-server/files/autoinstall/partman/raid5-gpt.cfg
3 files changed, 25 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/39/119039/1
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index 8820297..405428d 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -81,6 +81,6 @@
virt100[1-9]) echo partman/virt-raid10-cisco.cfg ;; \
labnet1001) echo partman/lvm.cfg ;; \
wtp100[5-9]|wtp10[1-2][0-9]|hafnium) echo partman/raid1-lvm.cfg
;; \
- carbon) echo partman/raid5-gpt.cfg ;; \
+ carbon) echo partman/raid5-gpt-lvm.cfg ;; \
hydrogen|krypton|tarin) echo partman/raid1-1partition.cfg ;; \
esac
diff --git a/modules/install-server/files/autoinstall/partman/raid5-gpt-lvm.cfg
b/modules/install-server/files/autoinstall/partman/raid5-gpt-lvm.cfg
index 50b3bc7..2f0f6d2 100644
--- a/modules/install-server/files/autoinstall/partman/raid5-gpt-lvm.cfg
+++ b/modules/install-server/files/autoinstall/partman/raid5-gpt-lvm.cfg
@@ -21,13 +21,22 @@
1 1 1 grub \
$primary{ } method{ biosgrub } \
. \
- 50000 8000 50000 raid \
+ 500 800 500 raid \
+ $primary{ } method{ raid } \
+ . \
+ 1500000 1500000 -1 raid \
$primary{ } method{ raid } \
$lvmignore{ } \
. \
- 1000 1000 -1 raid \
- $primary{ } method{ raid } \
- $lvmignore{ } \
+ 1000000 1000000 1000000 ext3 \
+ $lvmok{ } \
+ $defaultignore{ } \
+ lv_name{ root } \
+ method{ format } \
+ format{ } \
+ use_filesystem{ } \
+ filesystem{ ext3 } \
+ mountpoint{ / } \
. \
1000 1000 1000 linux-swap \
$defaultignore{ } \
@@ -37,11 +46,13 @@
format{ } \
.
+
+
# Parameters are:
# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
# <devices> <sparedevices>
d-i partman-auto-raid/recipe string \
- 5 4 0 ext3 / \
+ 1 4 0 ext3 /boot \
/dev/sda2#/dev/sdb2#/dev/sdc2#/dev/sdd2 \
. \
5 4 0 lvm - \
diff --git a/modules/install-server/files/autoinstall/partman/raid5-gpt.cfg
b/modules/install-server/files/autoinstall/partman/raid5-gpt.cfg
index b8783e2..341f863 100644
--- a/modules/install-server/files/autoinstall/partman/raid5-gpt.cfg
+++ b/modules/install-server/files/autoinstall/partman/raid5-gpt.cfg
@@ -1,12 +1,12 @@
# Automatic software RAID partitioning
#
-# * two disks, sda & sdb
-# * primary partitions, no LVM
+# * 4 disks, sda, sdb, sdc, sdd
+# * primary partitions
# * GPT layout (large disks, > 2TB)
# * layout:
# - swap: RAID1, 1GB
-# - / : ext3, RAID5, 50GB
-# - /srv: ext3, RAID5, rest of the space
+# - /boot: ext3, RAID1, 500MB
+# - /: ext3, RAID5, rest of the space
d-i partman-auto/method string raid
d-i partman-md/device_remove_md boolean true
@@ -21,13 +21,13 @@
1 1 1 grub \
$primary{ } method{ biosgrub } \
. \
- 50000 8000 50000 raid \
+ 500 800 500 raid \
$primary{ } method{ raid } \
. \
1000 1000 1000 raid \
$primary{ } method{ raid } \
. \
- 1000 1000 1000000 raid \
+ 50000 80000 -1 raid \
$primary{ } method{ raid } \
.
@@ -35,13 +35,13 @@
# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
# <devices> <sparedevices>
d-i partman-auto-raid/recipe string \
- 5 4 0 ext3 / \
+ 1 4 0 ext3 /boot \
/dev/sda2#/dev/sdb2#/dev/sdc2#/dev/sdd2 \
. \
5 4 0 swap - \
/dev/sda3#/dev/sdb3#/dev/sdc3#/dev/sdd3 \
. \
- 5 4 0 ext3 /srv \
+ 5 4 0 ext3 / \
/dev/sda4#/dev/sdb4#/dev/sdc4#/dev/sdd4 \
.
--
To view, visit https://gerrit.wikimedia.org/r/119039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibfb068c0d2a81f0005b0fadeb0a3da0c846972b2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
