Merge pull request voxpupuli#143 from sp-guillem-anguera/master

Using cwd to set the log directory is not valid after accepting pull

Author: shivapoudel

manifests/pip.pp

@@ -38,10 +38,13 @@
 #  String. Any additional installation arguments that will be supplied
 #  when running pip install.
 #
-# [*uninstall args*]
+# [*uninstall_args*]
 # String. Any additional arguments that will be supplied when running
 # pip uninstall.
 #
+# [*log_dir*]
+# String. Log directory.
+#
 # === Examples
 #
 # python::pip { 'flask':
@@ -67,7 +70,7 @@
   $install_args    = '',
   $uninstall_args  = '',
   $timeout         = 1800,
-  $log_dir         = '/',
+  $log_dir         = '/tmp',
 ) {
 
   # Parameter validation
@@ -80,6 +83,11 @@
   }
 
   $cwd = $virtualenv ? {
+    'system' => '/',
+    default  => $virtualenv,
+  }
+
+  $log = $virtualenv ? {
     'system' => $log_dir,
     default  => $virtualenv,
   }
@@ -150,7 +158,7 @@
       # Version formats as per http://guide.python-distribute.org/specification.html#standard-versioning-schemes
       # Explicit version.
       exec { "pip_install_${name}":
-        command     => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { ${pip_env} --log ${cwd}/pip.log install ${install_args} \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source}==${ensure} || ${pip_env} --log ${cwd}/pip.log install ${install_args} ${proxy_flag} ${install_args} ${install_editable} ${source}==${ensure} ;}",
+        command     => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { ${pip_env} --log ${log}/pip.log install ${install_args} \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source}==${ensure} || ${pip_env} --log ${log}/pip.log install ${install_args} ${proxy_flag} ${install_args} ${install_editable} ${source}==${ensure} ;}",
         unless      => "${pip_env} freeze | grep -i -e ${grep_regex}",
         user        => $owner,
         cwd         => $cwd,
@@ -163,7 +171,7 @@
     present: {
       # Whatever version is available.
       exec { "pip_install_${name}":
-        command     => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { ${pip_env} --log ${cwd}/pip.log install \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source} || ${pip_env} --log ${cwd}/pip.log install ${proxy_flag} ${install_args} ${install_editable} ${source} ;}",
+        command     => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { ${pip_env} --log ${log}/pip.log install \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source} || ${pip_env} --log ${log}/pip.log install ${proxy_flag} ${install_args} ${install_editable} ${source} ;}",
         unless      => "${pip_env} freeze | grep -i -e ${grep_regex}",
         user        => $owner,
         cwd         => $cwd,
@@ -176,7 +184,7 @@
     latest: {
       # Latest version.
       exec { "pip_install_${name}":
-        command     => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { ${pip_env} --log ${cwd}/pip.log install --upgrade \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source} || ${pip_env} --log ${cwd}/pip.log install --upgrade ${proxy_flag} ${install_args} ${install_editable} ${source} ;}",
+        command     => "${pip_env} wheel --help > /dev/null 2>&1 && { ${pip_env} wheel --version > /dev/null 2>&1 || wheel_support_flag='--no-use-wheel'; } ; { ${pip_env} --log ${log}/pip.log install --upgrade \$wheel_support_flag ${proxy_flag} ${install_args} ${install_editable} ${source} || ${pip_env} --log ${log}/pip.log install --upgrade ${proxy_flag} ${install_args} ${install_editable} ${source} ;}",
         unless      => "${pip_env} search ${source} | grep -i INSTALLED | grep -i latest",
         user        => $owner,
         cwd         => $cwd,

manifests/requirements.pp

@@ -41,6 +41,9 @@
 # [*fix_requirements_owner*]
 # Change owner and group of requirements file. Default: true
 #
+# [*log_dir*]
+# String. Log directory.
+#
 # === Examples
 #
 # python::requirements { '/var/www/project1/requirements.txt':
@@ -66,7 +69,7 @@
   $cwd                    = undef,
   $extra_pip_args         = '',
   $fix_requirements_owner = true,
-  $log_dir                = '/',
+  $log_dir                = '/tmp',
 ) {
 
   if $virtualenv == 'system' and ($owner != 'root' or $group != 'root') {
@@ -81,7 +84,7 @@
     $group_real = undef
   }
 
-  $rootdir = $virtualenv ? {
+  $log = $virtualenv ? {
     'system' => $log_dir,
     default  => $virtualenv,
   }
@@ -117,7 +120,7 @@
 
   exec { "python_requirements${name}":
     provider    => shell,
-    command     => "${pip_env} --log ${rootdir}/pip.log install ${proxy_flag} ${src_flag} -r ${requirements} ${extra_pip_args}",
+    command     => "${pip_env} --log ${log}/pip.log install ${proxy_flag} ${src_flag} -r ${requirements} ${extra_pip_args}",
     refreshonly => !$forceupdate,
     timeout     => 1800,
     cwd         => $cwd,