Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365895 )
Change subject: rsync::quickdatacopy: avoid duplicate declaration errors
......................................................................
rsync::quickdatacopy: avoid duplicate declaration errors
If rsync::quickdatacopy is used in more than one role and these
are applied on the same host (example netmon2001) we get puppet
errors because "duplicate declaration" of resource Cron[sync-rsync-data].
Add $title to the resource name to avoid that.
Change-Id: Icbadf9902f54831a96ce4d7cc13d4dc1a92687d5
---
M modules/rsync/manifests/quickdatacopy.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/rsync/manifests/quickdatacopy.pp
b/modules/rsync/manifests/quickdatacopy.pp
index 71b9de0..329d6b1 100644
--- a/modules/rsync/manifests/quickdatacopy.pp
+++ b/modules/rsync/manifests/quickdatacopy.pp
@@ -62,7 +62,7 @@
} else {
$cron_ensure = 'absent'
}
- cron { 'sync-rsync-data':
+ cron { "rsync-${title}":
ensure => $cron_ensure,
minute => '*/10',
command => "/usr/local/sbin/sync-${title} >/dev/null 2>&1",
--
To view, visit https://gerrit.wikimedia.org/r/365895
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icbadf9902f54831a96ce4d7cc13d4dc1a92687d5
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
