Ottomata has submitted this change and it was merged.
Change subject: - Sending varnishncsa traffic to gadolinium instead of oxygen
for multicast relay. - Removing locke varnishncsa instance. locke is no longer
used.
......................................................................
- Sending varnishncsa traffic to gadolinium instead of oxygen for multicast
relay.
- Removing locke varnishncsa instance. locke is no longer used.
- Also some style formatting changes.
Change-Id: I361bf33718ec42b89ddbb63e2ffd09912f49e9ba
---
M manifests/misc/blogs.pp
M manifests/role/cache.pp
2 files changed, 5 insertions(+), 8 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/blogs.pp b/manifests/misc/blogs.pp
index 5e55a53..fe22567 100644
--- a/manifests/misc/blogs.pp
+++ b/manifests/misc/blogs.pp
@@ -62,9 +62,8 @@
monitor => false,
}
# send blog access logs to udp2log instances.
- varnish::logging { "locke" : listener_address =>
"208.80.152.138" }
varnish::logging { "emery" : listener_address =>
"208.80.152.184" }
- varnish::logging { "multicast_relay" : listener_address =>
"208.80.154.15", port => "8419" }
+ varnish::logging { "multicast_relay" : listener_address =>
"208.80.154.73", port => "8419" }
# Capture blog traffic logs on its own stream in analytics cluster.
# 208.80.154.154 == analytics1001.wikimedia.org
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index e61aa55..66e241e 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -529,9 +529,8 @@
xff_sources =>
$network::constants::all_networks,
}
- varnish::logging { "locke" : listener_address
=> "208.80.152.138" , cli_args => "-m RxRequest:^(?!PURGE\$) -D" }
- varnish::logging { "emery" : listener_address
=> "208.80.152.184" , cli_args => "-m RxRequest:^(?!PURGE\$) -D" }
- varnish::logging { "multicast_relay" : listener_address
=> "208.80.154.15" , port => "8419", cli_args => "-m RxRequest:^(?!PURGE\$) -D"
}
+ varnish::logging { 'emery' : listener_address
=> '208.80.152.184' , cli_args => '-m RxRequest:^(?!PURGE\$) -D' }
+ varnish::logging { 'multicast_relay' : listener_address
=> '208.80.154.73' , port => '8419', cli_args => '-m RxRequest:^(?!PURGE\$) -D'
}
# HTCP packet loss monitoring on the ganglia aggregators
if $ganglia_aggregator and $::site != "esams" {
@@ -764,9 +763,8 @@
}
if( $::realm == 'production' ) {
- varnish::logging { "locke" : listener_address
=> "208.80.152.138", cli_args => "-m RxRequest:^(?!PURGE\$) -D" }
- varnish::logging { "emery" : listener_address
=> "208.80.152.184", cli_args => "-m RxRequest:^(?!PURGE\$) -D" }
- varnish::logging { "multicast_relay" : listener_address
=> "208.80.154.15", port => "8419", cli_args => "-m RxRequest:^(?!PURGE\$) -D" }
+ varnish::logging { 'emery' : listener_address
=> '208.80.152.184', cli_args => '-m RxRequest:^(?!PURGE\$) -D' }
+ varnish::logging { 'multicast_relay' : listener_address
=> '208.80.154.73', port => '8419', cli_args => '-m RxRequest:^(?!PURGE\$) -D' }
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/61986
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I361bf33718ec42b89ddbb63e2ffd09912f49e9ba
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
