[MediaWiki-commits] [Gerrit] operations/puppet[production]: install_server: use separate /srv for bastions

2016-09-15 Thread Filippo Giunchedi (Code Review)
Filippo Giunchedi has submitted this change and it was merged.

Change subject: install_server: use separate /srv for bastions
..


install_server: use separate /srv for bastions

Bastions all come with two disks in software raid, unify all partman recipes on
separate /srv.

Change-Id: I94d4a57962eb321bfc883261d4507020d057bd7a
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Filippo Giunchedi: 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 c295666..0b21558 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -55,7 +55,8 @@
 aqs100[123]) echo partman/raid1-30G.cfg ;; \
 aqs100[456]) echo partman/aqs-cassandra-8ssd-2srv.cfg ;; \
 arsenic|heze|neodymium|oxygen|palladium|promethium|strontium|terbium) 
echo partman/lvm.cfg ;; \
-bast[124]001|copper|neon|ruthenium|subra|suhail|ocg1003) echo 
partman/raid1-lvm.cfg ;; \
+copper|neon|ruthenium|subra|suhail|ocg1003) echo partman/raid1-lvm.cfg 
;; \
+bast[1234]*) echo partman/raid1-lvm-ext4-srv.cfg ;; \
 californium|dbproxy10[0-1][0-9]|install2001|iridium) echo 
partman/raid1.cfg ;; \
 boron) echo partman/lvm.cfg ;; \
 helium|potassium|tmh1002|hydrogen|chromium) echo 
partman/raid1-1partition.cfg ;; \
@@ -69,7 +70,7 @@
 
db[0-8][0-9]|db10[0-8][0-9]|db109[0-4]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9])
 echo partman/db.cfg ;; \
 d-i-test) echo partman/cassandrahosts-12hdd.cfg ;; \
 druid100[123]) echo partman/druid-4ssd-raid10.cfg ;; \
-eeden|bast3001|maerlant|multatuli|nescio) echo 
partman/raid1-1partition.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]|elastic20[0-2][0-9]|elastic203[0-1]) 
echo partman/elasticsearch-raid1.cfg ;; \
 relforge100[12]) echo partman/raid10-gpt-srv-lvm-ext4.cfg ;; \

-- 
To view, visit https://gerrit.wikimedia.org/r/309995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I94d4a57962eb321bfc883261d4507020d057bd7a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: install_server: use separate /srv for bastions

2016-09-12 Thread Filippo Giunchedi (Code Review)
Filippo Giunchedi has uploaded a new change for review.

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

Change subject: install_server: use separate /srv for bastions
..

install_server: use separate /srv for bastions

Bastions all come with two disks in software raid, unify all partman recipes on
separate /srv.

Change-Id: I94d4a57962eb321bfc883261d4507020d057bd7a
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/309995/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 0ccfc63..c30802a 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -55,7 +55,8 @@
 aqs100[123]) echo partman/raid1-30G.cfg ;; \
 aqs100[456]) echo partman/aqs-cassandra-8ssd-2srv.cfg ;; \
 arsenic|heze|neodymium|oxygen|palladium|promethium|strontium|terbium) 
echo partman/lvm.cfg ;; \
-bast[124]001|copper|neon|ruthenium|subra|suhail|titanium|ocg1003) echo 
partman/raid1-lvm.cfg ;; \
+copper|neon|ruthenium|subra|suhail|titanium|ocg1003) echo 
partman/raid1-lvm.cfg ;; \
+bast[1234]*) echo partman/raid1-lvm-ext4-srv.cfg ;; \
 californium|dbproxy10[0-1][0-9]|install2001|iridium) echo 
partman/raid1.cfg ;; \
 boron) echo partman/lvm.cfg ;; \
 helium|potassium|tmh1002|hydrogen|chromium) echo 
partman/raid1-1partition.cfg ;; \
@@ -69,7 +70,7 @@
 
db[0-8][0-9]|db10[0-8][0-9]|db109[0-4]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9])
 echo partman/db.cfg ;; \
 d-i-test) echo partman/cassandrahosts-12hdd.cfg ;; \
 druid100[123]) echo partman/druid-4ssd-raid10.cfg ;; \
-eeden|bast3001|maerlant|multatuli|nescio) echo 
partman/raid1-1partition.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]|elastic20[0-2][0-9]|elastic203[0-1]) 
echo partman/elasticsearch-raid1.cfg ;; \
 relforge100[12]) echo partman/raid10-gpt-srv-lvm-ext4.cfg ;; \

-- 
To view, visit https://gerrit.wikimedia.org/r/309995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94d4a57962eb321bfc883261d4507020d057bd7a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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