Mark Bergsma has submitted this change and it was merged.
Change subject: Install cp1037-1040 as text Varnish
......................................................................
Install cp1037-1040 as text Varnish
Change-Id: I28b87625b42746ea90270b6843900e684b32ec8f
---
M files/autoinstall/netboot.cfg
M manifests/role/cache.pp
M manifests/site.pp
3 files changed, 20 insertions(+), 3 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/autoinstall/netboot.cfg b/files/autoinstall/netboot.cfg
index 7b392a3..f3ceb80 100755
--- a/files/autoinstall/netboot.cfg
+++ b/files/autoinstall/netboot.cfg
@@ -38,7 +38,7 @@
boron|chromium|hydrogen) echo partman/lvm.cfg ;; \
calcium|helium|potassium|tmh1001|tmh1002) echo
partman/raid1-1partition.cfg ;; \
capella) echo partman/lvs.cfg ;; \
-
cp102[1-9]|cp103[0-6]|cp104[1-4]|cp30[0-9][0-9]|sq6[7-9]|sq70|dysprosium) echo
partman/raid1-varnish.cfg ;; \
+
cp102[1-9]|cp103[0-9]|cp104[01-4]|cp30[0-9][0-9]|sq6[7-9]|sq70|dysprosium) echo
partman/raid1-varnish.cfg ;; \
antimony|barium|caesium|celsus|cerium|europium|gadolinium|holmium|lanthanum|magnesium|neodymium|palladium|promethium|strontium|terbium|titanium|xenon|wtp100[1-4])
echo partman/lvm.cfg ;; \
colby|constable|kuo|lardner|mexia|tola) echo partman/lvm.cfg ;;
\
lvs*) echo partman/lvs.cfg ;; \
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 5d90662..d815ad2 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -61,6 +61,12 @@
'cp1019.eqiad.wmnet',
'cp1020.eqiad.wmnet',
],
+ "eqiad-varnish" => [
+ 'cp1037.eqiad.wmnet',
+ 'cp1038.eqiad.wmnet',
+ 'cp1039.eqiad.wmnet',
+ 'cp1040.eqiad.wmnet',
+ ],
"esams" => [
"knsq23.knams.wikimedia.org",
"knsq24.knams.wikimedia.org",
@@ -355,7 +361,7 @@
}
class text {
- if ($::site == "esams" and $::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 =~ /^amssq(4[7-9]|[56][0-9])$/) or ($::realm == "labs" and
$::hostname =~ /^deployment-cache-text/) {
# Varnish
$cluster = "cache_text"
@@ -370,7 +376,8 @@
$varnish_fe_directors = {
# pmtpa is for labs / beta cluster
"pmtpa" => { "backend" =>
$role::cache::configuration::active_nodes[$::realm]['text'][$::site] },
- "eqiad" => { "backend" =>
$role::cache::configuration::active_nodes[$::realm]['text'][$::site] },
+ # TODO: replace after removing Squid
+ "eqiad" => { "backend" =>
$role::cache::configuration::active_nodes[$::realm]['text']["${::site}-varnish"]
},
# TODO: replace after removing Squid
"esams" => { "backend" =>
$role::cache::configuration::active_nodes[$::realm]['text']["${::site}-varnish"]
},
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 60edd58..976da54 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -333,6 +333,16 @@
include role::cache::upload
}
+node /^cp10(3[7-9]|40)\.eqiad\.wmnet$/ {
+ if $::hostname =~ /^cp103[78]$/ {
+ $ganglia_aggregator = true
+ }
+
+ interface_add_ip6_mapped { "main": }
+
+ include role::cache::text
+}
+
# eqiad varnish for m.wikipedia.org
node /^cp104[1-4]\.(wikimedia\.org|eqiad\.wmnet)$/ {
--
To view, visit https://gerrit.wikimedia.org/r/66074
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28b87625b42746ea90270b6843900e684b32ec8f
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
