Added owner, group to the pip class which ensures that packages will be installed with the correct permissions.

fgimian · fgimian · commit 3c606c95e12b · 2013-06-03T19:41:24.000+10:00
diff --git a/manifests/pip.pp b/manifests/pip.pp
@@ -29,9 +29,11 @@
 #
 define python::pip (
   $virtualenv,
-  $ensure = present,
-  $url    = false,
-  $proxy  = false
+  $ensure     = present,
+  $url        = false,
+  $owner      = 'root',
+  $group      = 'root',
+  $proxy      = false
 ) {
 
   # Parameter validation
@@ -57,15 +59,17 @@
   case $ensure {
     present: {
       exec { "pip_install_${name}":
-        command => "${virtualenv}/bin/pip install ${proxy_flag} ${source}",
-        unless  => "${virtualenv}/bin/pip freeze | grep -i -e ${grep_regex}",
+        command     => "${virtualenv}/bin/pip install ${proxy_flag} ${source}",
+        unless      => "${virtualenv}/bin/pip freeze | grep -i -e ${grep_regex}",
+        user        => $owner,
       }
     }
 
     default: {
       exec { "pip_uninstall_${name}":
-        command => "echo y | ${virtualenv}/bin/pip uninstall ${proxy_flag} ${name}",
-        onlyif  => "${virtualenv}/bin/pip freeze | grep -i -e ${grep_regex}",
+        command     => "echo y | ${virtualenv}/bin/pip uninstall ${proxy_flag} ${name}",
+        onlyif      => "${virtualenv}/bin/pip freeze | grep -i -e ${grep_regex}",
+        user        => $owner,
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,11 @@`
`29`	`29`	`#`
`30`	`30`	`define python::pip (`
`31`	`31`	`$virtualenv,`
`32`		`- $ensure = present,`
`33`		`- $url = false,`
`34`		`- $proxy = false`
	`32`	`+ $ensure = present,`
	`33`	`+ $url = false,`
	`34`	`+ $owner = 'root',`
	`35`	`+ $group = 'root',`
	`36`	`+ $proxy = false`
`35`	`37`	`) {`
`36`	`38`
`37`	`39`	`# Parameter validation`
`@@ -57,15 +59,17 @@`
`57`	`59`	`case $ensure {`
`58`	`60`	`present: {`
`59`	`61`	`exec { "pip_install_${name}":`
`60`		`- command => "${virtualenv}/bin/pip install ${proxy_flag} ${source}",`
`61`		`- unless => "${virtualenv}/bin/pip freeze \| grep -i -e ${grep_regex}",`
	`62`	`+ command => "${virtualenv}/bin/pip install ${proxy_flag} ${source}",`
	`63`	`+ unless => "${virtualenv}/bin/pip freeze \| grep -i -e ${grep_regex}",`
	`64`	`+ user => $owner,`
`62`	`65`	`}`
`63`	`66`	`}`
`64`	`67`
`65`	`68`	`default: {`
`66`	`69`	`exec { "pip_uninstall_${name}":`
`67`		`- command => "echo y \| ${virtualenv}/bin/pip uninstall ${proxy_flag} ${name}",`
`68`		`- onlyif => "${virtualenv}/bin/pip freeze \| grep -i -e ${grep_regex}",`
	`70`	`+ command => "echo y \| ${virtualenv}/bin/pip uninstall ${proxy_flag} ${name}",`
	`71`	`+ onlyif => "${virtualenv}/bin/pip freeze \| grep -i -e ${grep_regex}",`
	`72`	`+ user => $owner,`
`69`	`73`	`}`
`70`	`74`	`}`
`71`	`75`	`}`