Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: ganglia: unbreak the labs NFS cluster
......................................................................
ganglia: unbreak the labs NFS cluster
Change-Id: If598b7d93267189486598f7b66d1020d01abce43
---
M manifests/role/labsnfs.pp
M manifests/site.pp
2 files changed, 4 insertions(+), 9 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labsnfs.pp b/manifests/role/labsnfs.pp
index 65483b9..9a67d69 100644
--- a/manifests/role/labsnfs.pp
+++ b/manifests/role/labsnfs.pp
@@ -8,9 +8,6 @@
# must be set at the node level or via hiera.
#
class role::labs::nfs::dumps($dump_servers_ips) {
-
- $gangla_aggregator = true
-
include standard
include rsync::server
@@ -41,9 +38,6 @@
# services to Labs.
#
class role::labs::nfs::fileserver {
-
- $gangla_aggregator = true
-
include standard
# eqiad still uses LDAP for now
@@ -78,4 +72,3 @@
}
}
-
diff --git a/manifests/site.pp b/manifests/site.pp
index 9745cc2..0aa4aae 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1320,7 +1320,9 @@
}
node /labstore100[12]\.eqiad\.wmnet/ {
-
+ if $::hostname == 'labstore1001' {
+ $ganglia_aggregator = true
+ }
$site = 'eqiad'
$cluster = 'labsnfs'
@@ -1329,7 +1331,7 @@
}
node 'labstore1003.eqiad.wmnet' {
-
+ $ganglia_aggregator = true
$site = 'eqiad'
$cluster = 'labsnfs'
--
To view, visit https://gerrit.wikimedia.org/r/200856
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If598b7d93267189486598f7b66d1020d01abce43
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
