Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172546
Change subject: txstatsd/graphite: switch back to package
......................................................................
txstatsd/graphite: switch back to package
require_package interacts badly (with require => Package[]?) and makes puppet
fail non-deterministically (!) on hosts, revert back to package. note this
means that txstatsd is missing python-carbon dependency when installed on
hosts that don't include graphite.
Change-Id: Ib66958e3b2f24b93d8779e9283e2daee435f74e7
---
M modules/graphite/manifests/init.pp
M modules/graphite/manifests/web.pp
M modules/txstatsd/manifests/init.pp
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/172546/1
diff --git a/modules/graphite/manifests/init.pp
b/modules/graphite/manifests/init.pp
index 6502af7..a27918a 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -14,7 +14,7 @@
$storage_aggregation = {},
$storage_dir = '/var/lib/carbon',
) {
- require_package('graphite-carbon', 'python-whisper')
+ 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 1572609..9de4aba 100644
--- a/modules/graphite/manifests/web.pp
+++ b/modules/graphite/manifests/web.pp
@@ -45,7 +45,7 @@
) {
include ::graphite
- require_package('memcached', 'python-memcache', 'graphite-web')
+ 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 5df52c0..1b8923f 100644
--- a/modules/txstatsd/manifests/init.pp
+++ b/modules/txstatsd/manifests/init.pp
@@ -23,7 +23,7 @@
# }
#
class txstatsd($settings) {
- require_package('python-txstatsd', 'python-twisted-web', 'graphite-carbon')
+ package { ['python-txstatsd', 'python-twisted-web']: }
file { '/etc/init/txstatsd.conf':
source => 'puppet:///modules/txstatsd/txstatsd.conf',
--
To view, visit https://gerrit.wikimedia.org/r/172546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib66958e3b2f24b93d8779e9283e2daee435f74e7
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
