From fd6b693eaa3ddb949cda5451055247ab02620942 Mon Sep 17 00:00:00 2001 From: Matthew Schmitt Date: Tue, 15 Mar 2016 20:23:18 -0700 Subject: [PATCH 1/8] Name of gunicorn package available in EPEL is python-gunicorn --- manifests/install.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/install.pp b/manifests/install.pp index 049a3e31..5daf2acf 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -218,7 +218,7 @@ default => $python::gunicorn, } - package { 'gunicorn': + package { 'python-gunicorn': ensure => $gunicorn_ensure, } } From f4fa2ffabfe3014655f9f43677387b636ad1a959 Mon Sep 17 00:00:00 2001 From: Matthew Schmitt Date: Tue, 15 Mar 2016 20:46:22 -0700 Subject: [PATCH 2/8] Ensure creation of gunicorn.d directory for storing config files --- manifests/gunicorn.pp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifests/gunicorn.pp b/manifests/gunicorn.pp index 37739875..e382828b 100644 --- a/manifests/gunicorn.pp +++ b/manifests/gunicorn.pp @@ -91,6 +91,8 @@ validate_re($log_level, 'debug|info|warning|error|critical', "Invalid \$log_level value ${log_level}") + ensure_resource('file', '/etc/gunicorn.d', {'ensure' => 'directory'}) + file { "/etc/gunicorn.d/${name}": ensure => $ensure, mode => '0644', From 321ae7de37fa1e8bdc169196d8652353247976ef Mon Sep 17 00:00:00 2001 From: Matthew Schmitt Date: Wed, 16 Mar 2016 10:24:34 -0700 Subject: [PATCH 3/8] Updating name of virtualenv package to install --- manifests/install.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/install.pp b/manifests/install.pp index 5daf2acf..7feabbf2 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -50,7 +50,7 @@ name => $python, } - package { 'virtualenv': + package { "${python::version}-python-virtualenv": ensure => $venv_ensure, require => Package['python'], } From 4413f65ab90f8eadc9672f56a0a46adc97cdb318 Mon Sep 17 00:00:00 2001 From: Matthew Schmitt Date: Fri, 18 Mar 2016 16:02:48 -0700 Subject: [PATCH 4/8] Updating virtualenv package name for dependancy --- manifests/install.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/install.pp b/manifests/install.pp index 7feabbf2..71498fdc 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -183,7 +183,7 @@ if ($venv_ensure != 'absent') and ($::operatingsystemrelease =~ /^6/) { if $python::use_epel == true { include 'epel' - Class['epel'] -> Package['virtualenv'] + Class['epel'] -> Package['python-virtualenv'] } } From e04a3364e8b6c9062ca7fd3c3d071611c9d9e697 Mon Sep 17 00:00:00 2001 From: Matthew Schmitt Date: Thu, 14 Apr 2016 15:22:23 -0700 Subject: [PATCH 5/8] Removing var for virtualenv package name --- manifests/install.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/install.pp b/manifests/install.pp index 6ff22d98..7c06d833 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -50,7 +50,7 @@ name => $python, } - package { "${python::version}-python-virtualenv": + package { 'python-virtualenv': ensure => $venv_ensure, require => Package['python'], } From 8a0150fc5dfd84c3f89a8cb059f2febfa563407b Mon Sep 17 00:00:00 2001 From: Matthew Schmitt Date: Tue, 19 Apr 2016 11:45:03 -0700 Subject: [PATCH 6/8] Setting default value for python package name --- manifests/install.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/install.pp b/manifests/install.pp index 7c06d833..9323b03e 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -18,7 +18,7 @@ $python = $::python::version ? { 'system' => 'python', 'pypy' => 'pypy', - default => "python${python::version}", + default => "${python::version}-python", } $pythondev = $::osfamily ? { From 204285a4a8b9b929f14730f42ee71508e6fa8e71 Mon Sep 17 00:00:00 2001 From: Matthew Schmitt Date: Wed, 20 Apr 2016 11:46:54 -0700 Subject: [PATCH 7/8] Updating name of python devel package for scl repo --- manifests/install.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/install.pp b/manifests/install.pp index 9323b03e..19558dde 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -117,7 +117,7 @@ # ensure => $venv_ensure, # require => Package['scl-utils'], # } - package { "${python}-scldevel": + package { "${python}-devel": ensure => $dev_ensure, require => Package['scl-utils'], } From a6957fb7ec3e1f392224eadc975ca66a28eea2d2 Mon Sep 17 00:00:00 2001 From: Matthew Schmitt Date: Thu, 16 Mar 2017 12:02:39 -0700 Subject: [PATCH 8/8] Updating scl package names --- manifests/install.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/install.pp b/manifests/install.pp index 2aadc58c..fb32c595 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -121,7 +121,7 @@ # ensure => $venv_ensure, # require => Package['scl-utils'], # } - package { "${python}-devel": + package { "${python}-python-devel": ensure => $dev_ensure, require => Package['scl-utils'], }