Filippo Giunchedi has submitted this change and it was merged.
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/graphite/manifests/web.pp
M modules/txstatsd/manifests/init.pp
3 files changed, 3 insertions(+), 5 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Giuseppe Lavagetto: Looks good to me, but someone else must approve
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/graphite/manifests/web.pp
b/modules/graphite/manifests/web.pp
index f94e8b3..8d286ea 100644
--- a/modules/graphite/manifests/web.pp
+++ b/modules/graphite/manifests/web.pp
@@ -45,8 +45,7 @@
) {
include ::graphite
- package { [ 'memcached', 'python-memcache' ]: }
- package { 'graphite-web': }
+ require_package(['memcached', 'python-memcache', 'graphite-web'])
file { '/etc/graphite/cors.py':
source => 'puppet:///modules/graphite/cors.py',
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: merged
Gerrit-Change-Id: Ie7dd5ad5d7437ee36ad056aa72a8f05153524cd2
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
