Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338320 )
Change subject: ldap::client::utils: Move to require_package
......................................................................
ldap::client::utils: Move to require_package
This avoids duplicated declarations as it happened during the
merge of cd2557fbc50ebe79f78b54e2980490c65cf5f749 and the
followup fix 02129508441abf1dea0feb3d8070ee16e3eb6fd0
Change-Id: Ib1ae69c6cc84ec2880008e9f8c26d707ed3ec2bd
---
M modules/ldap/manifests/client/utils.pp
1 file changed, 1 insertion(+), 6 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
Volans: Looks good to me, but someone else must approve
diff --git a/modules/ldap/manifests/client/utils.pp
b/modules/ldap/manifests/client/utils.pp
index 399c042..09f050f 100644
--- a/modules/ldap/manifests/client/utils.pp
+++ b/modules/ldap/manifests/client/utils.pp
@@ -4,12 +4,7 @@
# ldap database will then be listed as users of the system, so use care.
class ldap::client::utils($ldapconfig) {
- package { [
- 'python-ldap',
- 'python-pycurl',
- ]:
- ensure => present,
- }
+ require_package('python-ldap', 'python-pycurl')
file { '/usr/local/sbin/add-ldap-group':
owner => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/338320
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1ae69c6cc84ec2880008e9f8c26d707ed3ec2bd
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
