Added string type to defined type pip, ensure

danquack · danquack · commit 0faf83acdd59 · 2018-10-22T09:52:33.000-04:00
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -15,7 +15,7 @@
 * [`python::dotfile`](#pythondotfile): Manages any python dotfiles with a simple config hash.
 * [`python::gunicorn`](#pythongunicorn): Manages Gunicorn virtual hosts.
 * [`python::pip`](#pythonpip): Installs and manages packages from pip.
-* [`python::pyvenv`](#pythonpyvenv): 
+* [`python::pyvenv`](#pythonpyvenv): Create a Python3 virtualenv using pyvenv.
 * [`python::requirements`](#pythonrequirements): Installs and manages Python packages from requirements file.
 * [`python::virtualenv`](#pythonvirtualenv): Creates Python virtualenv.
 
@@ -543,7 +543,7 @@ Default value: $name
 
 ##### `ensure`
 
-Data type: `Enum[present, absent, latest]`
+Data type: `Variant[Enum[present, absent, latest], String]`
 
 Require pip to be available.
 
@@ -693,7 +693,7 @@ Default value: ['/usr/local/bin','/usr/bin','/bin', '/usr/sbin']
 
 ### python::pyvenv
 
-The python::pyvenv class.
+Create a Python3 virtualenv using pyvenv.
 
 #### Examples
 
diff --git a/manifests/pip.pp b/manifests/pip.pp
@@ -32,25 +32,25 @@
 #
 #
 define python::pip (
-  String $pkgname                        = $name,
-  Enum[present, absent, latest] $ensure  = present,
-  String $virtualenv                     = 'system',
-  Enum['pip', 'pip3'] $pip_provider      = 'pip',
-  Variant[Boolean, String] $url          = false,
-  String $owner                          = 'root',
-  String $group                          = 'root',
-  $umask                                 = undef,
-  $index                                 = false,
-  Variant[Boolean, String] $proxy        = false,
-  $egg                                   = false,
-  Boolean $editable                      = false,
-  $environment                           = [],
-  $extras                                = [],
-  String $install_args                   = '',
-  String $uninstall_args                 = '',
-  Numeric $timeout                       = 1800,
-  String $log_dir                        = '/tmp',
-  Array[String] $path                    = ['/usr/local/bin','/usr/bin','/bin', '/usr/sbin'],
+  String $pkgname                                         = $name,
+  Variant[Enum[present, absent, latest], String] $ensure  = present,
+  String $virtualenv                                      = 'system',
+  Enum['pip', 'pip3'] $pip_provider                       = 'pip',
+  Variant[Boolean, String] $url                           = false,
+  String $owner                                           = 'root',
+  String $group                                           = 'root',
+  $umask                                                  = undef,
+  $index                                                  = false,
+  Variant[Boolean, String] $proxy                         = false,
+  $egg                                                    = false,
+  Boolean $editable                                       = false,
+  $environment                                            = [],
+  $extras                                                 = [],
+  String $install_args                                    = '',
+  String $uninstall_args                                  = '',
+  Numeric $timeout                                        = 1800,
+  String $log_dir                                         = '/tmp',
+  Array[String] $path                                     = ['/usr/local/bin','/usr/bin','/bin', '/usr/sbin'],
 ) {
   $python_provider = getparam(Class['python'], 'provider')
   $python_version  = getparam(Class['python'], 'version')
