Gehel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342662 )
Change subject: elasticsearch - no need to use swap
......................................................................
elasticsearch - no need to use swap
Bug: T158884
Change-Id: I7160c74746da6d8835a897fa1d067b9c26f99926
---
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/autoinstall/partman/elasticsearch-raid0.cfg
2 files changed, 4 insertions(+), 10 deletions(-)
Approvals:
RobH: Looks good to me, but someone else must approve
Gehel: Verified; Looks good to me, approved
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 99ade61..1b20cb9 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -69,8 +69,8 @@
druid100[123]) echo partman/druid-4ssd-raid10.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.cfg ;; \
- elastic20[0-2][0-9]|elastic203[0-6]) echo
partman/raid1-lvm-ext4-srv.cfg ;; \
+ elastic103[2-9]|elastic104[0-9]|elastic105[0-2]) echo
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
+ elastic20[0-2][0-9]|elastic203[0-6]) echo
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
labmon1001|mwlog[12]001|relforge100[12]|scb200[1-6]) echo
partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
analytics1003|cobalt|thorium) echo partman/raid10-gpt-srv-lvm-ext4.cfg
;; \
aluminium|argon|chlorine|bromine|bohrium|darmstadtium|dbmonitor[12]001|dubnium|etcd100[1-6]|etherpad[12]001|fermium|hassaleh|hassium|krypton|meitnerium|mendelevium|mwdebug100[12]|nihal|nitrogen|planet[12]001|pollux|rutherfordium|sca[12]00[34]|seaborgium|serpens|alsafi|kraz|install[12]00[12]|ununpentium|zosma)
echo partman/flat.cfg virtual.cfg ;; \
diff --git
a/modules/install_server/files/autoinstall/partman/elasticsearch-raid0.cfg
b/modules/install_server/files/autoinstall/partman/elasticsearch-raid0.cfg
index 8986fba..90c55a0 100644
--- a/modules/install_server/files/autoinstall/partman/elasticsearch-raid0.cfg
+++ b/modules/install_server/files/autoinstall/partman/elasticsearch-raid0.cfg
@@ -4,7 +4,6 @@
# * primary partitions, no LVM
# * layout:
# - / : ext3, RAID1, 30GB
-# - swap: RAID1, 1GB
# - /srv: ext4, RAID0, rest of the space on both drives.
#
# (This file was duplicated from raid1-30G.cfg.)
@@ -23,9 +22,6 @@
5000 8000 30000 raid \
$primary{ } method{ raid } \
. \
- 1000 1000 1000 raid \
- $primary{ } method{ raid } \
- . \
1000 1000 -1 raid \
$primary{ } method{ raid }
\
.
@@ -37,11 +33,8 @@
1 2 0 ext3 / \
/dev/sda1#/dev/sdb1 \
. \
- 1 2 0 swap - \
- /dev/sda2#/dev/sdb2 \
- . \
0 2 0 ext4 /srv \
- /dev/sda3#/dev/sdb3 \
+ /dev/sda2#/dev/sdb2 \
.
d-i partman-md/confirm boolean true
@@ -50,3 +43,4 @@
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
--
To view, visit https://gerrit.wikimedia.org/r/342662
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7160c74746da6d8835a897fa1d067b9c26f99926
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: RobH <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
