Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108222
Change subject: Create python::pil; relax restrictions on packages.pp
......................................................................
Create python::pil; relax restrictions on packages.pp
- The rule that packages must be declared with no parameters is too strict for
packages installable via pip, since those must at least specify provider =>
'pip'. So relax the restriction for now.
- At the same time, the setup for PIL really is a bit too involved for
packages.pp, so move it to a python::pil class in its own module.
Change-Id: I575809a87b62346b11d254a8a1d1e72daf9a9e24
---
M puppet/manifests/packages.pp
M puppet/manifests/roles.pp
2 files changed, 2 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/22/108222/1
diff --git a/puppet/manifests/packages.pp b/puppet/manifests/packages.pp
index 566c0ae..9e5e39b 100644
--- a/puppet/manifests/packages.pp
+++ b/puppet/manifests/packages.pp
@@ -9,8 +9,7 @@
# prohibition on duplicate definitions.
#
# *Note*:: each class in this file must correspond to a package of the
-# same name. The package must be declared with no parameters. If you
-# need to do anything fancier, create a module instead.
+# same name. If you need anything fancy, create a module instead.
#
class packages::imagemagick {
@@ -61,14 +60,6 @@
package { 'openjdk-7-jdk': }
}
-class packages::python_dev {
- package { 'python-dev': }
-}
-
-class packages::zlib1g_dev {
- package { 'zlib1g-dev': }
-}
-
class packages::wikitools {
package { 'wikitools':
ensure => '1.1',
@@ -80,24 +71,5 @@
package { 'poster':
ensure => '0.8.0',
provider => 'pip',
- }
-}
-
-class packages::pil {
- include packages::zlib1g_dev
- include packages::python_dev
-
- # Workaround for 'pip install pil' failing to find libz.so and thus
- # installing without zlib support. See <http://goo.gl/eWJc24>.
- file { '/usr/lib/libz.so':
- ensure => link,
- target => "/usr/lib/${::hardwaremodel}-linux-gnu/libz.so",
- before => Package['pil'],
- }
-
- package { 'pil':
- ensure => '1.1.7',
- provider => 'pip',
- require => Package['python-dev', 'zlib1g-dev'],
}
}
diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index b1165c6..98062fc 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -267,7 +267,7 @@
include role::codeeditor
# API smoke test dependencies
- include packages::pil
+ include python::pil
include packages::poster
include packages::wikitools
--
To view, visit https://gerrit.wikimedia.org/r/108222
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I575809a87b62346b11d254a8a1d1e72daf9a9e24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
