Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172261
Change subject: txstats/graphite: fix package conflict, use require_package
......................................................................
txstats/graphite: fix package conflict, use require_package
Change-Id: Ie7dd5ad5d7437ee36ad056aa72a8f05153524cd2
---
M modules/graphite/manifests/init.pp
M modules/txstatsd/manifests/init.pp
2 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/172261/1
diff --git a/modules/graphite/manifests/init.pp
b/modules/graphite/manifests/init.pp
index 2353804..ea69ff8 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -14,8 +14,7 @@
$storage_aggregation = {},
$storage_dir = '/var/lib/carbon',
) {
- package { 'graphite-carbon': }
- package { 'python-whisper': }
+ require_package(['graphite-carbon', 'python-whisper'])
$carbon_service_defaults = {
log_updates => false,
diff --git a/modules/txstatsd/manifests/init.pp
b/modules/txstatsd/manifests/init.pp
index 3917a5b..9d080e9 100644
--- a/modules/txstatsd/manifests/init.pp
+++ b/modules/txstatsd/manifests/init.pp
@@ -23,7 +23,7 @@
# }
#
class txstatsd($settings) {
- package { [ 'python-txstatsd', 'python-twisted-web', 'graphite-carbon' ]: }
+ require_package(['python-txstatsd', 'python-twisted-web',
'graphite-carbon'])
file { '/etc/init/txstatsd.conf':
source => 'puppet:///modules/txstatsd/txstatsd.conf',
--
To view, visit https://gerrit.wikimedia.org/r/172261
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7dd5ad5d7437ee36ad056aa72a8f05153524cd2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
