Filippo Giunchedi has submitted this change and it was merged.

Change subject: diamond: require python-statsd
......................................................................


diamond: require python-statsd

use require_package due to python-statsd being included multiple times (e.g.
swift)

Change-Id: I0cc7328c7d8271fe2cc86a88de937d4961c22aa4
---
M modules/diamond/manifests/init.pp
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/diamond/manifests/init.pp 
b/modules/diamond/manifests/init.pp
index 9641a6b..9014959 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -63,9 +63,12 @@
     },
 ) {
     package { [ 'python-diamond', 'python-configobj' ]:
-        ensure => present,
+        ensure  => present,
+        require => Class['packages::python_statsd'],
     }
 
+    require_package('python-statsd')
+
     file { [ '/etc/diamond/collectors', '/etc/diamond/handlers' ]:
         ensure  => directory,
         owner   => 'root',

-- 
To view, visit https://gerrit.wikimedia.org/r/178195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0cc7328c7d8271fe2cc86a88de937d4961c22aa4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Chasemp <chas...@gmail.com>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@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

Reply via email to