[MediaWiki-commits] [Gerrit] Remove GM engine from thumbor role - change (mediawiki/vagrant)

[Gilles (Code Review)]

Gilles has uploaded a new change for review.

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

Change subject: Remove GM engine from thumbor role
......................................................................

Remove GM engine from thumbor role

It takes forever to install (would require an even higher timeout) and isn't 
used unless activated in thumbor's config.

Change-Id: I3aab7b6e55bc868b4ac51e4b7574d36cf72bd707
---
M puppet/modules/thumbor/manifests/init.pp
M puppet/modules/virtualenv/manifests/environment.pp
M puppet/modules/wmflib/lib/puppet/parser/functions/require_package.rb
3 files changed, 11 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/89/239989/1

diff --git a/puppet/modules/thumbor/manifests/init.pp 
b/puppet/modules/thumbor/manifests/init.pp
index 75d8432..ea11fd2 100644
--- a/puppet/modules/thumbor/manifests/init.pp
+++ b/puppet/modules/thumbor/manifests/init.pp
@@ -38,8 +38,12 @@
             'cv2',
             'numpy',
             'opencv-engine',
-            'graphicsmagick-engine',
         ],
+        require => [
+            Package['libjpeg-progs'],
+            Package['python-opencv'],
+        ],
+        timeout => 600, # This venv can be particularly long to download and 
setup
     }
 
     # Hack because pip install cv2 inside a virtualenv is broken
diff --git a/puppet/modules/virtualenv/manifests/environment.pp 
b/puppet/modules/virtualenv/manifests/environment.pp
index 1a04492..5f78f64 100644
--- a/puppet/modules/virtualenv/manifests/environment.pp
+++ b/puppet/modules/virtualenv/manifests/environment.pp
@@ -25,12 +25,16 @@
 # [*group*]
 #   Group owner of the environment directory and created files.
 #
+# [*timeout*]
+#   Timeout for the command creating the environment.
+#
 define virtualenv::environment (
     $packages,
     $dir       = $title,
     $ensure    = 'present',
     $owner     = 'root',
     $group     = 'root',
+    $timeout   = 300,
 ) {
     require ::virtualenv
 
@@ -48,6 +52,7 @@
             user    => $owner,
             group   => $group,
             require => File[$dir],
+            timeout => $timeout,
         }
     } elsif $ensure == 'absent' {
         file { $dir:
diff --git 
a/puppet/modules/wmflib/lib/puppet/parser/functions/require_package.rb 
b/puppet/modules/wmflib/lib/puppet/parser/functions/require_package.rb
index 91d69cd..cf32a7c 100644
--- a/puppet/modules/wmflib/lib/puppet/parser/functions/require_package.rb
+++ b/puppet/modules/wmflib/lib/puppet/parser/functions/require_package.rb
@@ -20,7 +20,7 @@
 module Puppet::Parser::Functions
   newfunction(:require_package, :arity => -2) do |args|
     args.each do |package_name|
-      class_name = 'packages::' + package_name.tr('-', '_')
+      class_name = 'packages::' + package_name.tr('-+', '_')
       unless compiler.topscope.find_hostclass(class_name)
         host = Puppet::Resource::Type.new(:hostclass, class_name)
         known_resource_types.add_hostclass(host)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3aab7b6e55bc868b4ac51e4b7574d36cf72bd707
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles <gdu...@wikimedia.org>

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