Mark Bergsma has submitted this change and it was merged.
Change subject: Setup ulsfo boxes as mobile caches
......................................................................
Setup ulsfo boxes as mobile caches
Change-Id: Iab17a0156ca2bb1571944f128d3cd2c86f9a6ec8
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 13 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 30dbfe5..2b8e404 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -194,6 +194,7 @@
"pmtpa" => [],
'eqiad' => ['cp1046.eqiad.wmnet',
'cp1047.eqiad.wmnet', 'cp1059.eqiad.wmnet', 'cp1060.eqiad.wmnet'],
"esams" =>
['cp3011.esams.wikimedia.org', 'cp3012.esams.wikimedia.org',
'cp3013.esams.wikimedia.org', 'cp3014.esams.wikimedia.org'],
+ "ulsfo" => ['cp4011.ulsfo.wmnet',
'cp4012.ulsfo.wmnet', 'cp4019.ulsfo.wmnet', 'cp4020.ulsfo.wmnet']
},
"parsoid" => {
"pmtpa" => [],
@@ -322,7 +323,8 @@
"mobile" => {
"pmtpa" => [],
"eqiad" => ['cp1041.eqiad.wmnet',
'cp1042.eqiad.wmnet'],
- "esams" => []
+ "esams" => [],
+ "ulsfo" => [],
},
"parsoid" => {
"pmtpa" => [],
diff --git a/manifests/site.pp b/manifests/site.pp
index 257e361..2a76ed3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -458,7 +458,7 @@
include role::cache::bits, role::cache::ssl::unified
}
-node /^cp40(0[5-7]|1[3-5])\.ulsfo.wmnet$/ {
+node /^cp40(0[5-7]|1[3-5])\.ulsfo\.wmnet$/ {
if $::hostname =~ /^cp(4005|4013)$/ {
$ganglia_aggregator = true
}
@@ -468,6 +468,15 @@
include role::cache::upload, role::cache::ssl::unified
}
+node /^cp40(1[129]|20)\.ulsfo\.wmnet$/ {
+ if $::hostname =~ /^cp401[19]$/ {
+ $ganglia_aggregator = true
+ }
+
+ interface::add_ip6_mapped { "main": }
+
+ include role::cache::mobile, role::cache::ssl::unified
+}
node "dataset2.wikimedia.org" {
$cluster = "misc"
--
To view, visit https://gerrit.wikimedia.org/r/91373
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab17a0156ca2bb1571944f128d3cd2c86f9a6ec8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
