[MediaWiki-commits] [Gerrit] python-statsd: use require_package everywhere - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/178221

Change subject: python-statsd: use require_package everywhere
......................................................................

python-statsd: use require_package everywhere

to avoid duplicate declarations require_package() is needed everywhere

Change-Id: I959194a96c159411f5193991461aa817607bee68
---
M manifests/role/swift.pp
M manifests/swift.pp
M modules/swift_new/manifests/init.pp
M modules/swift_new/manifests/stats/accounts.pp
M modules/swift_new/manifests/stats/dispersion.pp
M modules/zuul/manifests/init.pp
6 files changed, 11 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/178221/1

diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 39522ba..b7026e6 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -47,7 +47,7 @@
                 mode    => '0555',
                 source  => 'puppet:///files/swift/swift-account-stats',
                 require => [Package['python-swiftclient'],
-                            Package['python-statsd']
+                            Package['packages::python_statsd']
                         ],
             }
             file { '/etc/swift/account_mw_media.env':
@@ -71,7 +71,7 @@
                 mode    => '0555',
                 source  => 'puppet:///files/swift/swift-dispersion-stats',
                 require => [Package['swift'],
-                            Package['python-statsd']
+                            Package['packages::python_statsd']
                         ],
             }
             cron { 'swift-dispersion-stats':
@@ -188,7 +188,7 @@
                 mode    => '0555',
                 source  => 'puppet:///files/swift/swift-account-stats',
                 require => [Package['python-swiftclient'],
-                            Package['python-statsd']
+                            Package['packages::python_statsd']
                         ],
             }
             file { '/etc/swift/account_mw_media.env':
@@ -212,7 +212,7 @@
                 mode    => '0555',
                 source  => 'puppet:///files/swift/swift-dispersion-stats',
                 require => [Package['swift'],
-                            Package['python-statsd']
+                            Package['packages::python_statsd']
                         ],
             }
             cron { 'swift-dispersion-stats':
diff --git a/manifests/swift.pp b/manifests/swift.pp
index 6f26256..84ab89c 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -33,11 +33,12 @@
         'swift-doc',
         'python-swift',
         'python-swiftclient',
-        'python-statsd',
         ]:
         ensure => 'present',
     }
 
+    require_package('python-statsd')
+
     File {
         owner => 'swift',
         group => 'swift',
diff --git a/modules/swift_new/manifests/init.pp 
b/modules/swift_new/manifests/init.pp
index a44cd99..121dbe3 100644
--- a/modules/swift_new/manifests/init.pp
+++ b/modules/swift_new/manifests/init.pp
@@ -37,12 +37,13 @@
         'swift',
         'python-swift',
         'python-swiftclient',
-        'python-statsd',
         'parted',
     ]:
         ensure => 'present',
     }
 
+    require_package('python-statsd')
+
     File {
         owner => 'swift',
         group => 'swift',
diff --git a/modules/swift_new/manifests/stats/accounts.pp 
b/modules/swift_new/manifests/stats/accounts.pp
index e06d721..71c9150 100644
--- a/modules/swift_new/manifests/stats/accounts.pp
+++ b/modules/swift_new/manifests/stats/accounts.pp
@@ -7,7 +7,7 @@
 ) {
     $required_packages = [
         Package['python-swiftclient'],
-        Package['python-statsd'],
+        Package['packages::python_statsd'],
         Package['swift'],
         ]
 
diff --git a/modules/swift_new/manifests/stats/dispersion.pp 
b/modules/swift_new/manifests/stats/dispersion.pp
index c7a5cc7..5a7b530 100644
--- a/modules/swift_new/manifests/stats/dispersion.pp
+++ b/modules/swift_new/manifests/stats/dispersion.pp
@@ -5,7 +5,7 @@
 ) {
     $required_packages = [
         Package['python-swiftclient'],
-        Package['python-statsd'],
+        Package['packages::python_statsd'],
         Package['swift'],
     ]
 
diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index 607644c..166e67a 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -41,7 +41,6 @@
     'python-smmap',
 
     'python-extras',  # backported in Precise (bug 47122)
-    'python-statsd',
 
     'python-pip',
     'python-setuptools',
@@ -56,6 +55,7 @@
     'python-prettytable',
   ]
 
+  require_package('python-statsd')
   ensure_packages($packages)
 
   # Used to be in /var/lib/git/zuul but /var/lib/git can be used

-- 
To view, visit https://gerrit.wikimedia.org/r/178221
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I959194a96c159411f5193991461aa817607bee68
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits