Ottomata has submitted this change and it was merged.
Change subject: Moving $ganglia_aggregator declaration above analytics class
includes.
......................................................................
Moving $ganglia_aggregator declaration above analytics class includes.
CRAZY PUPPET!
Change-Id: I334d51e4ba224ba0b7880490167eb1ea19ef9179
---
M manifests/site.pp
1 file changed, 8 insertions(+), 8 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 6c15b42..8f7ba40 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -133,12 +133,12 @@
# Unassigned Cisco nodes.
# NOTE: analytics1002-analytics1004 still need reinstalled as of 2013-08-26
node /analytics100[2-8]\.eqiad\.wmnet/ {
- include role::analytics
-
# ganglia aggregator for the Analytics cluster.
- if ($hostname == 'analytics1003') {
+ if ($::hostname == 'analytics1003') {
$ganglia_aggregator = true
}
+
+ include role::analytics
}
# analytics1009 is the Hadoop standby NameNode
@@ -157,16 +157,16 @@
# analytics1011-analytics1020 are Hadoop worker nodes
node /analytics10(1[1-9]|20).eqiad.wmnet/ {
+ # ganglia aggregator for the Analytics cluster.
+ if ($::hostname == 'analytics1011') {
+ $ganglia_aggregator = true
+ }
+
include role::analytics::common
include role::analytics::hadoop::worker
# include analytics user accounts
include role::analytics::users
-
- # ganglia aggregator for the Analytics cluster.
- if ($hostname == 'analytics1011') {
- $ganglia_aggregator = true
- }
}
# analytics1021 and analytics1022 are Kafka Brokers.
--
To view, visit https://gerrit.wikimedia.org/r/82846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I334d51e4ba224ba0b7880490167eb1ea19ef9179
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
