Make the inclusion of the epel class optional.

ghoneycutt · ghoneycutt · commit 4bb26f141e92 · 2015-07-04T12:34:43.000-04:00
Without this patch, people in secure environments who are not directly
routed to the internet or who mirror their own EPEL repositories cannot
use this module as it currently mandates the usage of the epel module.
This patch makes that optional and defaults to including it, such that
it will continue to work as expected for current users.
diff --git a/README.md b/README.md
@@ -42,6 +42,8 @@ Installs and manages python, python-pip, python-dev, python-virtualenv and Gunic
 
 **manage_gunicorn** - Allow Installation / Removal of Gunicorn. Default: true
 
+**use_epel** - Boolean to determine if the epel class is used. Default: true
+
 ```puppet
   class { 'python' :
     version    => 'system',
@@ -278,4 +280,4 @@ python::python_pips:
 
 ## Authors
 
-[Sergey Stankevich](https://github.com/stankevich) | [Shiva Poudel](https://github.com/shivapoudel)
+[Sergey Stankevich](https://github.com/stankevich) | [Shiva Poudel](https://github.com/shivapoudel) | [Garrett Honeycutt](http://learnpuppet.com)
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -37,6 +37,9 @@
 #  Default: system default provider
 #  Allowed values: 'pip'
 #
+# [*use_epel*]
+#  Boolean to determine if the epel class is used. Default: true
+#
 # === Examples
 #
 # class { 'python':
@@ -50,6 +53,7 @@
 # === Authors
 #
 # Sergey Stankevich
+# Garrett Honeycutt <code@garretthoneycutt.com>
 #
 class python (
   $version                   = $python::params::version,
@@ -63,6 +67,7 @@
   $python_pips               = { },
   $python_virtualenvs        = { },
   $python_pyvenvs            = { },
+  $use_epel                  = $python::params::use_epel,
 ) inherits python::params{
 
   # validate inputs
@@ -82,6 +87,7 @@
   validate_bool($virtualenv)
   validate_bool($gunicorn)
   validate_bool($manage_gunicorn)
+  validate_bool($use_epel)
 
   # Module compatibility check
   $compatible = [ 'Debian', 'RedHat', 'Suse' ]
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -1,4 +1,4 @@
-# == Define: python::install
+# == Class: python::install
 #
 # Installs core python packages
 #
@@ -11,8 +11,8 @@
 # Sergey Stankevich
 # Ashley Penney
 # Fotis Gimian
+# Garrett Honeycutt <code@garretthoneycutt.com>
 #
-
 class python::install {
 
   $python = $::python::version ? {
@@ -24,7 +24,7 @@
   $pythondev = $::osfamily ? {
     'RedHat' => "${python}-devel",
     'Debian' => "${python}-dev",
-    'Suse'   => "${python}-devel"
+    'Suse'   => "${python}-devel",
   }
 
   # pip version: use only for installation via os package manager!
@@ -59,12 +59,16 @@
     default: {
       if $::osfamily == 'RedHat' {
         if $pip_ensure == present {
-          include 'epel'
-          Class['epel'] -> Package[$pip]
+          if $python::use_epel == true {
+            include 'epel'
+            Class['epel'] -> Package[$pip]
+          }
         }
         if ($venv_ensure == present) and ($::operatingsystemrelease =~ /^6/) {
-          include 'epel'
-          Class['epel'] -> Package['python-virtualenv']
+          if $python::use_epel == true {
+            include 'epel'
+            Class['epel'] -> Package['python-virtualenv']
+          }
         }
       }
       package { 'python-virtualenv': ensure => $venv_ensure }
@@ -81,5 +85,4 @@
     }
     package { 'gunicorn': ensure => $gunicorn_ensure }
   }
-
 }
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -1,5 +1,5 @@
-
-# Class: python::params
+# == Class: python::params
+#
 # The python Module default configuration settings.
 #
 class python::params {
@@ -15,4 +15,5 @@
     'Debian' => ['3', '3.3'],
     'Suse'   => [],
   }
+  $use_epel               = true
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# == Define: python::install`
	`1`	`+# == Class: python::install`
`2`	`2`	`#`
`3`	`3`	`# Installs core python packages`
`4`	`4`	`#`
`@@ -11,8 +11,8 @@`
`11`	`11`	`# Sergey Stankevich`
`12`	`12`	`# Ashley Penney`
`13`	`13`	`# Fotis Gimian`
	`14`	`+# Garrett Honeycutt <[email protected]>`
`14`	`15`	`#`
`15`		`-`
`16`	`16`	`class python::install {`
`17`	`17`
`18`	`18`	`$python = $::python::version ? {`
`@@ -24,7 +24,7 @@`
`24`	`24`	`$pythondev = $::osfamily ? {`
`25`	`25`	`'RedHat' => "${python}-devel",`
`26`	`26`	`'Debian' => "${python}-dev",`
`27`		`- 'Suse' => "${python}-devel"`
	`27`	`+ 'Suse' => "${python}-devel",`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`# pip version: use only for installation via os package manager!`
`@@ -59,12 +59,16 @@`
`59`	`59`	`default: {`
`60`	`60`	`if $::osfamily == 'RedHat' {`
`61`	`61`	`if $pip_ensure == present {`
`62`		`- include 'epel'`
`63`		`- Class['epel'] -> Package[$pip]`
	`62`	`+ if $python::use_epel == true {`
	`63`	`+ include 'epel'`
	`64`	`+ Class['epel'] -> Package[$pip]`
	`65`	`+ }`
`64`	`66`	`}`
`65`	`67`	`if ($venv_ensure == present) and ($::operatingsystemrelease =~ /^6/) {`
`66`		`- include 'epel'`
`67`		`- Class['epel'] -> Package['python-virtualenv']`
	`68`	`+ if $python::use_epel == true {`
	`69`	`+ include 'epel'`
	`70`	`+ Class['epel'] -> Package['python-virtualenv']`
	`71`	`+ }`
`68`	`72`	`}`
`69`	`73`	`}`
`70`	`74`	`package { 'python-virtualenv': ensure => $venv_ensure }`
`@@ -81,5 +85,4 @@`
`81`	`85`	`}`
`82`	`86`	`package { 'gunicorn': ensure => $gunicorn_ensure }`
`83`	`87`	`}`
`84`		`-`
`85`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-`
`2`		`-# Class: python::params`
	`1`	`+# == Class: python::params`
	`2`	`+#`
`3`	`3`	`# The python Module default configuration settings.`
`4`	`4`	`#`
`5`	`5`	`class python::params {`
`@@ -15,4 +15,5 @@`
`15`	`15`	`'Debian' => ['3', '3.3'],`
`16`	`16`	`'Suse' => [],`
`17`	`17`	`}`
	`18`	`+ $use_epel = true`
`18`	`19`	`}`