Filippo Giunchedi has submitted this change and it was merged.
Change subject: elasticsearch partman and autoinstall
......................................................................
elasticsearch partman and autoinstall
We have two disk arrangements. Eqiad will be raid0
and Codfw will be raid1.
Bug: T111080
Change-Id: I18952e792d1349b0c7b0e6778854de461e7aafe8
---
M modules/install_server/files/autoinstall/netboot.cfg
R modules/install_server/files/autoinstall/partman/elasticsearch-raid0.cfg
C modules/install_server/files/autoinstall/partman/elasticsearch-raid1.cfg
3 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index b9653cf..f7d0de6 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -66,7 +66,8 @@
d-i-test) echo partman/raid1-lvm-conf.cfg ;; \
eeden|hooft|maerlant|multatuli|nescio) echo
partman/raid1-1partition.cfg ;; \
einsteinium) echo partman/raid1-lvm-ext4.cfg;; \
- elastic10[0-2][0-9]|elastic103[0-1]) echo
partman/elasticsearch.cfg ;; \
+ elastic10[0-2][0-9]|elastic103[0-1]) echo
partman/elasticsearch-raid0.cfg ;; \
+ elastic20[0-2][0-9]|elastic203[0-1]) echo
partman/elasticsearch-raid1.cfg ;; \
bromine|etherpad[12]001|fermium|krypton|planet1001) echo
partman/flat.cfg virtual.cfg ;; \
eventlog[1-2]001|labcontrol2001|ocg100[1-3]|sc[ab]100[1-2])
echo partman/raid1.cfg ;; \
francium|tungsten) echo partman/raid10-gpt.cfg ;; \
diff --git a/modules/install_server/files/autoinstall/partman/elasticsearch.cfg
b/modules/install_server/files/autoinstall/partman/elasticsearch-raid0.cfg
similarity index 94%
rename from modules/install_server/files/autoinstall/partman/elasticsearch.cfg
rename to
modules/install_server/files/autoinstall/partman/elasticsearch-raid0.cfg
index 9a0d925..377b15a 100644
--- a/modules/install_server/files/autoinstall/partman/elasticsearch.cfg
+++ b/modules/install_server/files/autoinstall/partman/elasticsearch-raid0.cfg
@@ -5,7 +5,7 @@
# * layout:
# - / : ext3, RAID1, 30GB
# - swap: RAID1, 1GB
-# - /var/lib/elasticserach: ext4, RAID0, rest of the space on both drives.
+# - /var/lib/elasticsearch: ext4, RAID0, rest of the space on both drives.
#
# (This file was duplicated from raid1-30G.cfg.)
diff --git a/modules/install_server/files/autoinstall/partman/elasticsearch.cfg
b/modules/install_server/files/autoinstall/partman/elasticsearch-raid1.cfg
similarity index 82%
copy from modules/install_server/files/autoinstall/partman/elasticsearch.cfg
copy to modules/install_server/files/autoinstall/partman/elasticsearch-raid1.cfg
index 9a0d925..6442e24 100644
--- a/modules/install_server/files/autoinstall/partman/elasticsearch.cfg
+++ b/modules/install_server/files/autoinstall/partman/elasticsearch-raid1.cfg
@@ -3,11 +3,10 @@
# * two disks, sda & sdb
# * primary partitions, no LVM
# * layout:
-# - / : ext3, RAID1, 30GB
+# - / : ext3, RAID1, 30GB
# - swap: RAID1, 1GB
-# - /var/lib/elasticserach: ext4, RAID0, rest of the space on both drives.
+# - /var/lib/elasticsearch: ext4, RAID1
#
-# (This file was duplicated from raid1-30G.cfg.)
d-i partman-auto/method string raid
d-i partman-md/device_remove_md boolean true
@@ -26,7 +25,7 @@
$primary{ } method{ raid } \
. \
1000 1000 -1 raid \
- $primary{ } method{ raid }
\
+ $primary{ } method{ keep }
\
.
# Parameters are:
@@ -39,7 +38,7 @@
1 2 0 swap - \
/dev/sda2#/dev/sdb2 \
. \
- 0 2 0 ext4 /var/lib/elasticsearch \
+ 1 2 0 ext4 /var/lib/elasticsearch \
/dev/sda3#/dev/sdb3 \
.
--
To view, visit https://gerrit.wikimedia.org/r/235893
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I18952e792d1349b0c7b0e6778854de461e7aafe8
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
