Merge pull request voxpupuli#498 from jamebus/pip-provider

bastelfreak · web-flow · commit 6c7ae9772cfb · 2019-12-09T18:53:46.000+01:00
Use shell to exec pip commands by default
diff --git a/manifests/pip.pp b/manifests/pip.pp
@@ -67,6 +67,7 @@
   Numeric $timeout                                           = 1800,
   String[1] $log_dir                                         = '/tmp',
   Array[String] $path                                        = ['/usr/local/bin','/usr/bin','/bin', '/usr/sbin'],
+  String[1] $exec_provider                                   = 'shell',
 ){
   $python_provider = getparam(Class['python'], 'provider')
   $python_version  = getparam(Class['python'], 'version')
@@ -240,6 +241,7 @@
     environment => $environment,
     timeout     => $timeout,
     path        => $_path,
+    provider    => $exec_provider,
   }
 
 }
diff --git a/manifests/pip/bootstrap.pp b/manifests/pip/bootstrap.pp
@@ -13,6 +13,7 @@
   Enum['pip', 'pip3'] $version            = 'pip',
   Variant[Boolean, String] $manage_python = false,
   Optional[Stdlib::HTTPUrl] $http_proxy   = undef,
+  String[1] $exec_provider                = 'shell',
 ) inherits python::params {
   if $manage_python {
     include python
@@ -37,6 +38,7 @@
         unless      => 'which pip3',
         path        => $python::params::pip_lookup_path,
         require     => Package['python3'],
+        provider    => $exec_provider,
       }
       # puppet is opinionated about the pip command name
       file { 'pip3-python':
@@ -52,6 +54,7 @@
         unless      => 'which pip',
         path        => $python::params::pip_lookup_path,
         require     => Package['python'],
+        provider    => $exec_provider,
       }
       # puppet is opinionated about the pip command name
       file { 'pip-python':

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@`
`67`	`67`	`Numeric $timeout = 1800,`
`68`	`68`	`String[1] $log_dir = '/tmp',`
`69`	`69`	`Array[String] $path = ['/usr/local/bin','/usr/bin','/bin', '/usr/sbin'],`
	`70`	`+ String[1] $exec_provider = 'shell',`
`70`	`71`	`){`
`71`	`72`	`$python_provider = getparam(Class['python'], 'provider')`
`72`	`73`	`$python_version = getparam(Class['python'], 'version')`
`@@ -240,6 +241,7 @@`
`240`	`241`	`environment => $environment,`
`241`	`242`	`timeout => $timeout,`
`242`	`243`	`path => $_path,`
	`244`	`+ provider => $exec_provider,`
`243`	`245`	`}`
`244`	`246`
`245`	`247`	`}`