Hello Alexandros Kosiaris,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/329329
to review the following change.
Change subject: puppetdb: Do not set up Ganglia in Labs
......................................................................
puppetdb: Do not set up Ganglia in Labs
Bug: T154104
Change-Id: Ic8648d3e1db7bec6b5abe6dab4311de32255fe24
---
M modules/role/manifests/puppetmaster/puppetdb.pp
1 file changed, 7 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/29/329329/1
diff --git a/modules/role/manifests/puppetmaster/puppetdb.pp
b/modules/role/manifests/puppetmaster/puppetdb.pp
index ac03a10..663d6bc 100644
--- a/modules/role/manifests/puppetmaster/puppetdb.pp
+++ b/modules/role/manifests/puppetmaster/puppetdb.pp
@@ -30,8 +30,6 @@
description => 'PuppetDB server',
}
- ganglia::plugin::python { 'diskstat': }
-
ferm::service { 'postgresql_puppetdb':
proto => 'tcp',
port => 5432,
@@ -62,9 +60,13 @@
srange => "@resolve((${puppetmasters_ferm}))",
}
- class { 'postgresql::ganglia':
- pgstats_user => $passwords::postgres::ganglia_user,
- pgstats_pass => $passwords::postgres::ganglia_pass,
+ if $::standard::has_ganglia {
+ class { 'postgresql::ganglia':
+ pgstats_user => $passwords::postgres::ganglia_user,
+ pgstats_pass => $passwords::postgres::ganglia_pass,
+ }
+
+ ganglia::plugin::python { 'diskstat': }
}
# Tuning
--
To view, visit https://gerrit.wikimedia.org/r/329329
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8648d3e1db7bec6b5abe6dab4311de32255fe24
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
