Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91864
Change subject: Add ulsfo text caches
......................................................................
Add ulsfo text caches
Change-Id: I2bc9f308ec67640c74f697244a5db6df4ef98f00
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 19 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/91864/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index f29131c..b44d5a2 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -5,6 +5,7 @@
@monitor_group { "cache_text_pmtpa": description => "text squids pmtpa" }
@monitor_group { "cache_text_eqiad": description => "text squids eqiad" }
@monitor_group { "cache_text_esams": description => "text squids esams" }
+@monitor_group { "cache_text_ulsfo": description => "ulsfo text Varnish" }
@monitor_group { "cache_upload_pmtpa": description => "upload squids pmtpa" }
@monitor_group { "cache_upload_eqiad": description => "eqiad upload Varnish" }
@@ -126,6 +127,14 @@
'amssq60.esams.wikimedia.org',
'amssq61.esams.wikimedia.org',
'amssq62.esams.wikimedia.org',
+ ],
+ 'ulsfo' => [
+ 'cp4008.ulsfo.wmnet',
+ 'cp4009.ulsfo.wmnet',
+ 'cp4010.ulsfo.wmnet',
+ 'cp4016.ulsfo.wmnet',
+ 'cp4017.ulsfo.wmnet',
+ 'cp4018.ulsfo.wmnet',
]
},
"api" => {
diff --git a/manifests/site.pp b/manifests/site.pp
index 2013414..e5713d2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -468,6 +468,16 @@
include role::cache::upload, role::cache::ssl::unified
}
+node /^cp40(0[89]|1[0678])\.ulsfo\.wmnet$/ {
+ if $::hostname =~ /^cp(4008|4016)$/ {
+ $ganglia_aggregator = true
+ }
+
+ interface::add_ip6_mapped { "main": }
+
+ include role::cache::text, role::cache::ssl::unified
+}
+
node /^cp40(1[129]|20)\.ulsfo\.wmnet$/ {
if $::hostname =~ /^cp401[19]$/ {
$ganglia_aggregator = true
--
To view, visit https://gerrit.wikimedia.org/r/91864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bc9f308ec67640c74f697244a5db6df4ef98f00
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
