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
