Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/254287
Change subject: diamond: fix up dependencies
......................................................................
diamond: fix up dependencies
Should resolve
Error:
/.../Diamond::Collector[..]/File[/usr/share/diamond/collectors/SSHSessions]/ensure:
change from absent to directory failed: Cannot create
/usr/share/diamond/collectors/SSHSessions; parent directory
/usr/share/diamond/collectors does not exist
and further dependencies.
Change-Id: I5769e347c6c3b407430147982c3db1dd40e1e003
---
M modules/diamond/manifests/collector.pp
M modules/diamond/manifests/init.pp
2 files changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/254287/1
diff --git a/modules/diamond/manifests/collector.pp
b/modules/diamond/manifests/collector.pp
index 2698df5..6b96318 100644
--- a/modules/diamond/manifests/collector.pp
+++ b/modules/diamond/manifests/collector.pp
@@ -83,6 +83,7 @@
group => 'root',
mode => '0755',
force => true,
+ require => File['/usr/share/diamond/collectors']
}
file { "/usr/share/diamond/collectors/${name}/${name}.py":
ensure => $ensure,
@@ -90,6 +91,7 @@
group => 'root',
mode => '0444',
notify => Service['diamond'],
+ require => File["/usr/share/diamond/collectors/${name}"]
}
if $source {
File["/usr/share/diamond/collectors/${name}/${name}.py"] {
diff --git a/modules/diamond/manifests/init.pp
b/modules/diamond/manifests/init.pp
index b993ca6..2e7e9cd 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -69,7 +69,10 @@
ensure => present,
}
- file { [ '/etc/diamond/collectors', '/etc/diamond/handlers' ]:
+ file { [ '/etc/diamond/collectors',
+ '/etc/diamond/handlers',
+ '/usr/share/diamond/collectors'
+ ]:
ensure => directory,
owner => 'root',
group => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/254287
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5769e347c6c3b407430147982c3db1dd40e1e003
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Merlijn van Deen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
