[MediaWiki-commits] [Gerrit] Add mw1161 and mw1201 as scap proxies for EQIAD row C and D - change (operations/puppet)

2014-04-01 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has submitted this change and it was merged.

Change subject: Add mw1161 and mw1201 as scap proxies for EQIAD row C and D
..


Add mw1161 and mw1201 as scap proxies for EQIAD row C and D

Change-Id: Ibe9ac2d8cb0173d38e72b558eb797bbafda55253
---
M files/dsh/group/scap-proxies
M manifests/site.pp
2 files changed, 12 insertions(+), 0 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/files/dsh/group/scap-proxies b/files/dsh/group/scap-proxies
index f42e14a..7dd383c 100644
--- a/files/dsh/group/scap-proxies
+++ b/files/dsh/group/scap-proxies
@@ -2,3 +2,7 @@
 mw1010.eqiad.wmnet
 # eqiad row B
 mw1070.eqiad.wmnet
+# eqiad row C
+mw1161.eqiad.wmnet
+# eqiad row D
+mw1201.eqiad.wmnet
diff --git a/manifests/site.pp b/manifests/site.pp
index f45715e..21ab067 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1972,12 +1972,20 @@
 # mw1161-1188 are apaches (precise)
 node /^mw11(6[1-9]|7[0-9]|8[0-8])\.eqiad\.wmnet$/ {
 
+if $::hostname == 'mw1161' {
+include misc::deployment::scap_proxy
+}
+
 include role::applicationserver::appserver
 }
 
 # mw1189-1208 are api apaches (precise)
 node /^mw1(189|19[0-9]|20[0-8])\.eqiad\.wmnet$/ {
 
+if $::hostname == 'mw1201' {
+include misc::deployment::scap_proxy
+}
+
 include role::applicationserver::appserver::api
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe9ac2d8cb0173d38e72b558eb797bbafda55253
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Add mw1161 and mw1201 as scap proxies for EQIAD row C and D - change (operations/puppet)

2014-03-19 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review.

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

Change subject: Add mw1161 and mw1201 as scap proxies for EQIAD row C and D
..

Add mw1161 and mw1201 as scap proxies for EQIAD row C and D

Change-Id: Ibe9ac2d8cb0173d38e72b558eb797bbafda55253
---
M files/dsh/group/scap-proxies
M manifests/site.pp
2 files changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/119686/1

diff --git a/files/dsh/group/scap-proxies b/files/dsh/group/scap-proxies
index f42e14a..7dd383c 100644
--- a/files/dsh/group/scap-proxies
+++ b/files/dsh/group/scap-proxies
@@ -2,3 +2,7 @@
 mw1010.eqiad.wmnet
 # eqiad row B
 mw1070.eqiad.wmnet
+# eqiad row C
+mw1161.eqiad.wmnet
+# eqiad row D
+mw1201.eqiad.wmnet
diff --git a/manifests/site.pp b/manifests/site.pp
index f80c852..8c98e1e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1975,8 +1975,8 @@
 include role::applicationserver::appserver
 }
 
-# mw1010 and mw1070 are scap proxies
-node /^mw10(10|70)\.eqiad\.wmnet$/ {
+# mw1010, mw1070, mw1161, mw1201 are scap proxies
+node /^mw(1010|1070|1161|1201)\.eqiad\.wmnet$/ {
 include misc::deployment::scap_proxy
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe9ac2d8cb0173d38e72b558eb797bbafda55253
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy re...@wikimedia.org

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