RobH has submitted this change and it was merged.
Change subject: Replaced all spacing with tab Bug:T121879
......................................................................
Replaced all spacing with tab
Bug:T121879
Change-Id: I7d4eafaf7e53de6517e8f6bd3158a2dfa6358ebd
---
M modules/install_server/files/autoinstall/partman/raid0-lvm-srv.cfg
1 file changed, 67 insertions(+), 67 deletions(-)
Approvals:
RobH: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/install_server/files/autoinstall/partman/raid0-lvm-srv.cfg
b/modules/install_server/files/autoinstall/partman/raid0-lvm-srv.cfg
index fa55e9c..f2d0769 100644
--- a/modules/install_server/files/autoinstall/partman/raid0-lvm-srv.cfg
+++ b/modules/install_server/files/autoinstall/partman/raid0-lvm-srv.cfg
@@ -1,81 +1,81 @@
-# Automatic software RAID 0 partitioning
+# Automatic software RAID partitioning
#
-# * 3 disks, sda, sdb & sdc
+# * 3 disks, sda, sdb, sdc
# * LVM
# * GPT layout (large disks, > 2TB)
# * layout:
-# - /boot: RAID0, 500MB
-# - / : ext3, RAID0, 50GB on LVM
-# - rest is lvm RAID0
+# - /boot: RAID0, 500MB
+# - / : ext3, RAID0, 50GB on LVM
+# - rest is lvm RAID0
-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/method string raid
+d-i partman-md/device_remove_md boolean true
+d-i partman-lvm/device_remove_lvm boolean true
-# Use the first three disks
-d-i partman-auto/disk string /dev/sda /dev/sdb /dev/sdc
+# Use the first two disks
+d-i partman-auto/disk string /dev/sda /dev/sdb /dev/sdc
# Don't stop if method isn't provided, e.g. in non used LVs
-d-i partman-basicmethods/method_only boolean false
+d-i partman-basicmethods/method_only boolean false
# Define physical partitions
-d-i partman-auto/expert_recipe string \
- multiraid :: \
- 10 1 10 grub \
- $gptonly{ } \
- $bios_boot{ } \
- $primary{ } method{ biosgrub } \
- . \
- 500 1 500 raid \
- $primary{ } method{ raid } \
- $lvmignore{ } \
- . \
- 500 2 -1 raid \
- $primary{ } method{ raid } \
- $lvmignore{ } \
- . \
- 50000 4 50000 ext3 \
- $lvmok{ } \
- $defaultignore{ } \
- lv_name{ root } \
- method{ format } \
- format{ } \
- use_filesystem{ } \
- filesystem{ ext3 } \
- mountpoint{ / } \
- .
- 64 1000 10000000 ext4 \
- $lvmok{ } \
- $defaultignore{ } \
- lv_name{ root } \
- method{ format } \
- format{ } \
- use_filesystem{ } \
- filesystem{ xfs } \
- mountpoint{ /srv } \
- . \
+d-i partman-auto/expert_recipe string \
+ multiraid :: \
+ 10 1 10 grub \
+ $gptonly{ } \
+ $bios_boot{ } \
+ $primary{ } method{ biosgrub } \
+ . \
+ 500 1 500 raid \
+ $primary{ } method{ raid } \
+ $lvmignore{ } \
+ . \
+ 500 2 -1 raid \
+ $primary{ } method{ raid } \
+ $lvmignore{ } \
+ . \
+ 50000 4 50000 ext3 \
+ $lvmok{ } \
+ $defaultignore{ } \
+ lv_name{ root } \
+ method{ format } \
+ format{ } \
+ use_filesystem{ } \
+ filesystem{ ext3 } \
+ mountpoint{ / } \
+ . \
+ 64 1000 10000000 xfs \
+ $lvmok{ }
\
+ $defaultignore{ } \
+ lv_name{ root } \
+ method{ format } \
+ format{ }
\
+ use_filesystem{ } \
+ filesystem{ xfs } \
+ mountpoint{ /srv } \
+
\
+ .
+
# Parameters are:
# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
-# <devices> <sparedevices>
-d-i partman-auto-raid/recipe string \
- 1 3 0 ext3 /boot \
- /dev/sda2#/dev/sdb2#/dev/sdc2 \
- . \
- 0 3 0 lvm - \
- /dev/sda3#/dev/sdb3#/dev/sdc3 \
- .
+# <devices> <sparedevices>
+d-i partman-auto-raid/recipe string \
+ 1 3 0 ext3 /boot \
+ /dev/sda2#/dev/sdb2#/dev/sdc2 \
+ . \
+ 0 3 0 lvm - \
+ /dev/sda3#/dev/sdb3#/dev/sdc3 \
+ .
-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 80%
-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
-
-
+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 80%
+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
--
To view, visit https://gerrit.wikimedia.org/r/262998
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7d4eafaf7e53de6517e8f6bd3158a2dfa6358ebd
Gerrit-PatchSet: 13
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Papaul <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: RobH <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
