Alexandros Kosiaris has submitted this change and it was merged.
Change subject: postgresql.pyconf is a template not a file
......................................................................
postgresql.pyconf is a template not a file
Also update tests
Change-Id: I34545aa6bbc8db8c1bd23e1dedae0ca1e3b41444
---
M modules/postgresql/manifests/ganglia.pp
M modules/postgresql/tests/ganglia.pp
2 files changed, 11 insertions(+), 7 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/postgresql/manifests/ganglia.pp
b/modules/postgresql/manifests/ganglia.pp
index b65b1bd..44f23f0 100644
--- a/modules/postgresql/manifests/ganglia.pp
+++ b/modules/postgresql/manifests/ganglia.pp
@@ -25,11 +25,11 @@
}
file { '/etc/ganglia/conf.d/postgresql.pyconf':
- ensure => $ensure,
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => "puppet:///modules/${module_name}/ganglia/postgresql.pyconf",
- notify => Service['gmond'],
+ ensure => $ensure,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ content => template('postgresql/ganglia/postgresql.pyconf.erb'),
+ notify => Service['gmond'],
}
}
diff --git a/modules/postgresql/tests/ganglia.pp
b/modules/postgresql/tests/ganglia.pp
index 1c72ddb..a07942d 100644
--- a/modules/postgresql/tests/ganglia.pp
+++ b/modules/postgresql/tests/ganglia.pp
@@ -1,3 +1,7 @@
#
-include postgresql::ganglia
+include postgresql::server
+class {'postgresql::ganglia':
+ pgstats_user => 'test',
+ pgstats_pass => 'test',
+}
--
To view, visit https://gerrit.wikimedia.org/r/134841
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I34545aa6bbc8db8c1bd23e1dedae0ca1e3b41444
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
