Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/75572
Change subject: Install new servers as Text Varnish caches
......................................................................
Install new servers as Text Varnish caches
Change-Id: I6182f8e18d731de15d46b6e4b1a732e2ad2f950a
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 19 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/75572/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 0f5d12f..940bd1a 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -71,10 +71,14 @@
'cp1020.eqiad.wmnet',
],
"eqiad" => [
- 'cp1037.eqiad.wmnet',
- 'cp1038.eqiad.wmnet',
- 'cp1039.eqiad.wmnet',
- 'cp1040.eqiad.wmnet',
+ 'cp1056.eqiad.wmnet',
+ 'cp1057.eqiad.wmnet',
+ 'cp1058.eqiad.wmnet',
+ 'cp1059.eqiad.wmnet',
+ 'cp1065.eqiad.wmnet',
+ 'cp1066.eqiad.wmnet',
+ 'cp1067.eqiad.wmnet',
+ 'cp1068.eqiad.wmnet',
],
"esams-squid" => [
"knsq23.knams.wikimedia.org",
@@ -777,7 +781,7 @@
$lvs::configuration::lvs_service_ips[$::realm]['text-varnish'][$::site]])
}
- if ($::hostname in ['cp1037', 'cp1038', 'cp1039', 'cp1040'] or
$::hostname =~ /^amssq(4[7-9]|[56][0-9])$/) or ($::realm == "labs" and
$::hostname =~ /^deployment-cache-text/) {
+ if ($::hostname in ['cp1037', 'cp1038', 'cp1039', 'cp1040'] or
$::hostname =~ /^cp10(5[2-5])|6[5-8])$/ or $::hostname =~
/^amssq(4[7-9]|[56][0-9])$/) or ($::realm == "labs" and $::hostname =~
/^deployment-cache-text/) {
# Varnish
include role::cache::varnish::text
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 4efdb35..84d1333 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -369,6 +369,16 @@
include role::cache::upload
}
+node /^cp10(5[2-5])|6[5-8])\.eqiad\.wmnet$/ {
+ if $::hostname =~ /^cp105[23]$/ {
+ $ganglia_aggregator = true
+ }
+
+ interface_add_ip6_mapped { "main": }
+
+ include role::cache::text
+}
+
node 'cp1056.eqiad.wmnet', 'cp1057.eqiad.wmnet', 'cp1069.eqiad.wmnet',
'cp1070.eqiad.wmnet' {
if $::hostname =~ /^cp105[67]$/ {
$ganglia_aggregator = true
--
To view, visit https://gerrit.wikimedia.org/r/75572
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6182f8e18d731de15d46b6e4b1a732e2ad2f950a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
