Yuvipanda has submitted this change and it was merged.
Change subject: diamond: Fix puppet failures on first run
......................................................................
diamond: Fix puppet failures on first run
Otherwise Puppet tries to place files in /usr/share/diamond/collectors
before it is created.
Change-Id: I12a8cd2b2bd0ef828c19ab2655689cc2d15e8cd2
---
M modules/diamond/manifests/collector.pp
1 file changed, 12 insertions(+), 10 deletions(-)
Approvals:
Ori.livneh: Looks good to me, but someone else must approve
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/diamond/manifests/collector.pp
b/modules/diamond/manifests/collector.pp
index 2698df5..8abc4bd 100644
--- a/modules/diamond/manifests/collector.pp
+++ b/modules/diamond/manifests/collector.pp
@@ -78,18 +78,20 @@
# Install a custom diamond collector if $source or $content were provided.
if $source or $content {
file { "/usr/share/diamond/collectors/${name}":
- ensure => ensure_directory($ensure),
- owner => 'root',
- group => 'root',
- mode => '0755',
- force => true,
+ ensure => ensure_directory($ensure),
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ force => true,
+ require => Package['python-diamond'],
}
file { "/usr/share/diamond/collectors/${name}/${name}.py":
- ensure => $ensure,
- owner => 'root',
- group => 'root',
- mode => '0444',
- notify => Service['diamond'],
+ ensure => $ensure,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ notify => Service['diamond'],
+ require => Package['python-diamond'],
}
if $source {
File["/usr/share/diamond/collectors/${name}/${name}.py"] {
--
To view, visit https://gerrit.wikimedia.org/r/258719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I12a8cd2b2bd0ef828c19ab2655689cc2d15e8cd2
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
