Filippo Giunchedi has submitted this change and it was merged.
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/swift.pp
M modules/swift_new/manifests/init.pp
M modules/zuul/manifests/init.pp
3 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
Ori.livneh: Looks good to me, but someone else must approve
Filippo Giunchedi: Verified; Looks good to me, approved
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/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: merged
Gerrit-Change-Id: I959194a96c159411f5193991461aa817607bee68
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
