Made system virtualenv more robust and ensured that pip logging would occur in an appropriate directory upon failure to avoid errors

1 files changed, 6 insertions, 3 deletions

diff --git a/manifests/requirements.pp b/manifests/requirements.pp
index 8b94839..3019a46 100644
--- a/manifests/requirements.pp
+++ b/manifests/requirements.pp
@@ -33,9 +33,13 @@ define python::requirements (
   $group        = 'root'
 ) {
 
+  if $virtualenv == 'system' and ($owner != 'root' or $group != 'root') {
+    fail('python::pip: root user must be used when virtualenv is system')
+  }
+
   $cwd = $virtualenv ? {
     'system' => '/',
-    default  => "${virtualenv}/bin/",
+    default  => "${virtualenv}",
   }
 
   $pip_env = $virtualenv ? {
@@ -64,8 +68,7 @@ define python::requirements (
 
   exec { "python_requirements${name}":
     provider    => shell,
-    command     => "${pip_env} install ${proxy_flag} -r ${requirements}",
-    cwd         => $cwd,
+    command     => "${pip_env} --log-file ${cwd}/pip.log install ${proxy_flag} -r ${requirements}",
     refreshonly => true,
     timeout     => 1800,
     user        => $owner,