[MediaWiki-commits] [Gerrit] elasticsearch partman and autoinstall - change (operations/puppet)

[Rush (Code Review)]

Rush has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/235893

Change subject: elasticsearch partman and autoinstall
......................................................................

elasticsearch partman and autoinstall

We have two disk arrangements. Eqiad will be raid0
and Codfw will be raid1.

WIP

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, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/93/235893/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index fda3fd2..f3d17df 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 ;; \
+               elastic10[0-2][0-9]) echo partman/elasticsearch-raid1.cfg ;; \
                etcd100[1-9]) echo partman/lvm-etcd.cfg virtual.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 ;; \
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 81%
copy from modules/install_server/files/autoinstall/partman/elasticsearch.cfg
copy to modules/install_server/files/autoinstall/partman/elasticsearch-raid1.cfg
index 9a0d925..8031294 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
@@ -25,8 +24,8 @@
                        1000    1000    1000    raid            \
                                $primary{ } method{ raid }      \
                        .                                       \
-                       1000    1000    -1      raid    \
-                               $primary{ } method{ raid }                      
\
+                       1000    1000    -1      linux-swap      \
+                               $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: newchange
Gerrit-Change-Id: I18952e792d1349b0c7b0e6778854de461e7aafe8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits