Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/208840

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

diamond: collectors require python-diamond

Spotted while running puppet:

  Error: Cannot create
  /usr/share/diamond/collectors/MinimalPuppetAgent;
  parent directory /usr/share/diamond/collectors does not exist

The parent directory is not defined in puppet but is provided by the
package:

  $ dpkg -L python-diamond|grep /usr/share/diamond/collectors$
  /usr/share/diamond/collectors
  $

Change-Id: I94ad33233695b5e7dd3a63a251bdac8da6260858
---
M modules/diamond/manifests/collector.pp
1 file changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/208840/1

diff --git a/modules/diamond/manifests/collector.pp 
b/modules/diamond/manifests/collector.pp
index 9ec19df..b84f638 100644
--- a/modules/diamond/manifests/collector.pp
+++ b/modules/diamond/manifests/collector.pp
@@ -67,10 +67,11 @@
 
     if $source {
         file { "/usr/share/diamond/collectors/${name}":
-            ensure => ensure_directory($ensure),
-            owner  => 'root',
-            group  => 'root',
-            mode   => '0755',
+            ensure  => ensure_directory($ensure),
+            owner   => 'root',
+            group   => 'root',
+            mode    => '0755',
+            require => Package['python-diamond'],
         }
 
         file { "/usr/share/diamond/collectors/${name}/${name}.py":

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94ad33233695b5e7dd3a63a251bdac8da6260858
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to