Muehlenhoff has submitted this change and it was merged.
Change subject: contint: use require_package for php5
......................................................................
contint: use require_package for php5
d903e25 added php5-dev to package_builder class which ends up causing a
duplicate definition with contint::packages.
Switch to require_package()
Change-Id: Iafd0e8ca84cf24ac8cb2e8ff395be4045b67de6e
---
M modules/contint/manifests/packages/php.pp
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/contint/manifests/packages/php.pp
b/modules/contint/manifests/packages/php.pp
index f003705..d84ad82 100644
--- a/modules/contint/manifests/packages/php.pp
+++ b/modules/contint/manifests/packages/php.pp
@@ -1,7 +1,7 @@
# == Class contint::packages::php
class contint::packages::php {
- package { [
+ require_package( [
'php5-dev', # phpize
'php5-ldap', # OpenStackManager/LdapAuthentication T125158
'php5-gd',
@@ -9,9 +9,7 @@
'php5-sqlite',
'php5-tidy',
'php5-xdebug',
- ]:
- ensure => present,
- }
+ ] )
package { [
'php5-parsekit',
]:
--
To view, visit https://gerrit.wikimedia.org/r/306214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iafd0e8ca84cf24ac8cb2e8ff395be4045b67de6e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
