Ori.livneh has submitted this change and it was merged.
Change subject: logstash nodes: assign $cluster before includes
......................................................................
logstash nodes: assign $cluster before includes
Change-Id: Id88bda3802145a6761c3ff654b55ffdc65dd16b7
---
M manifests/site.pp
1 file changed, 5 insertions(+), 6 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index ff7e4dd..6c26612 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2747,18 +2747,17 @@
}
node /^logstash100[1-3]\.eqiad\.wmnet$/ {
+ $cluster = 'logstash'
+ if $::hostname =~ /^logstash100[13]$/ {
+ $ganglia_aggregator = true
+ }
+
include standard
include role::logstash
include groups::wikidev
include accounts::aaron
include accounts::bd808
-
- $cluster = 'logstash'
-
- if $::hostname =~ /^logstash100[13]$/ {
- $ganglia_aggregator = true
- }
sudo_user { ['aaron', 'bd808']: # RT 6366
privileges => ['ALL = NOPASSWD: ALL'],
--
To view, visit https://gerrit.wikimedia.org/r/99730
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id88bda3802145a6761c3ff654b55ffdc65dd16b7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
