Gemfile

@@ -2,17 +2,23 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :test do
   gem 'metadata-json-lint',      :require => false
-  gem 'rake',                    :require => false
   gem 'rspec-puppet',            :require => false
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'puppet-lint',             :require => false
   gem 'pry',                     :require => false
   gem 'simplecov',               :require => false
 end
 
-# rspec must be v2 for ruby 1.8.7
+# pin old versions for ruby 1.8.7
 if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
   gem 'rspec', '~> 2.0'
+  gem 'rake', '~> 10.0'
+else
+  gem 'rake', :require => false
+end
+
+if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '2.0'
+  gem 'json', '~> 1.0'
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']

Rakefile

@@ -12,6 +12,7 @@ end
 PuppetLint.configuration.fail_on_warnings
 PuppetLint.configuration.send('relative')
 PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.send('disable_140chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.send('disable_class_parameter_defaults')
 PuppetLint.configuration.send('disable_documentation')
@@ -36,4 +37,4 @@ task :test => [
   :syntax,
   :lint,
   :spec,
-]
+]

lib/facter/python_version.rb

@@ -2,7 +2,7 @@
 
 def get_python_version(executable)
   if Facter::Util::Resolution.which(executable)
-    results = Facter::Util::Resolution.exec("#{executable} -V 2>&1").match(/^.*(\d+\.\d+\.\d+)$/)
+    results = Facter::Util::Resolution.exec("#{executable} -V 2>&1").match(/^.*(\d+\.\d+\.\d+\+?)$/)
     if results
       results[1]
     end

manifests/gunicorn.pp

@@ -77,6 +77,7 @@
   $appmodule         = 'app:app',
   $osenv             = false,
   $timeout           = 30,
+  $workers           = false,
   $access_log_format = false,
   $accesslog         = false,
   $errorlog          = false,

manifests/init.pp

@@ -74,6 +74,7 @@
   $virtualenv                = $python::params::virtualenv,
   $gunicorn                  = $python::params::gunicorn,
   $manage_gunicorn           = $python::params::manage_gunicorn,
+  $gunicorn_package_name     = $python::params::gunicorn_package_name,
   $provider                  = $python::params::provider,
   $valid_versions            = $python::params::valid_versions,
   $python_pips               = { },

manifests/install.pp

@@ -18,7 +18,7 @@
   $python = $::python::version ? {
     'system' => 'python',
     'pypy'   => 'pypy',
-    default  => "python${python::version}",
+    default  => "${python::version}",
   }
 
   $pythondev = $::osfamily ? {
@@ -103,7 +103,7 @@
         default  => 'absent',
       }
 
-      package { 'centos-release-SCL':
+      package { 'centos-release-scl':
         ensure => $install_scl_repo_package,
         before => Package['scl-utils'],
       }
@@ -219,6 +219,7 @@
     }
 
     package { 'gunicorn':
+      name   => $python::gunicorn_package_name,
       ensure => $gunicorn_ensure,
     }
   }

manifests/params.pp

@@ -17,4 +17,10 @@
     'Suse'   => [],
   }
   $use_epel               = true
+
+  $gunicorn_package_name = $::osfamily ? {
+    'RedHat' => 'python-gunicorn',
+    default  => 'gunicorn',
+  }
+
 }

manifests/pip.pp

@@ -85,15 +85,15 @@
 
   $python_provider = getparam(Class['python'], 'provider')
   $python_version  = getparam(Class['python'], 'version')
-  
+
   # Get SCL exec prefix
   # NB: this will not work if you are running puppet from scl enabled shell
   $exec_prefix = $python_provider ? {
     'scl'   => "scl enable ${python_version} -- ",
     'rhscl' => "scl enable ${python_version} -- ",
     default => '',
   }
-  
+
   # Parameter validation
   if ! $virtualenv {
     fail('python::pip: virtualenv parameter must not be empty')
@@ -117,7 +117,7 @@
 
   $pip_env = $virtualenv ? {
     'system' => "${exec_prefix}pip",
-    default  => "${virtualenv}/bin/pip",
+    default  => "${exec_prefix}${virtualenv}/bin/pip",
   }
 
   $pypi_index = $index ? {

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "stankevich-python",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "author": "stankevich",
   "summary": "Python Module",
   "license": "Apache-2.0",

templates/gunicorn.erb

@@ -31,7 +31,11 @@ CONFIG = {
 <% else -%>
     '--bind=<%= @bind %>',
 <% end -%>
-    '--workers=<%= @processorcount.to_i*2 %>',
+<% if @workers -%>
+    '--workers=<%= @workers %>',
+<% else -%>
+    '--workers=<%= @processorcount.to_i*2 + 1 %>',
+<% end -%>
     '--timeout=<%= @timeout %>',
 <% if @access_log_format -%>
     '--access-logformat=<%= @access_log_format %>',