summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorJarl Stefansson <jarl@sdelements.com>2013-11-05 18:36:27 -0500
committerJarl Stefansson <jarl@sdelements.com>2013-11-05 18:36:27 -0500
commit0a97baffaec11215137d49a5e2e7b905f7f681db (patch)
tree61f3d02aa877fc2f4622d4b046abe474f3121270 /manifests
parentec2b62a53479cbc8dea7adad69904ad1a430cc5d (diff)
Fixing up virtualenv pip install
Diffstat (limited to 'manifests')
-rw-r--r--manifests/install.pp15
1 files changed, 4 insertions, 11 deletions
diff --git a/manifests/install.pp b/manifests/install.pp
index cf0f78a..e90ecfe 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -28,19 +28,12 @@ class python::install {
$venv_ensure = $python::virtualenv ? {
true => present,
default => absent,
- pip => absent,
}
- case $python::virtualenv {
- 'pip': {
- exec { "pip-virtualenv":
- command => "pip install --upgrade virtualenv",
- cwd => $cwd,
- user => $run_as_user,
- timeout => 0,
- path => ["/usr/local/bin","/usr/bin","/bin", "/usr/sbin"],
- require => Package['python-pip']
- }
+ # Install latest from pip if pip is the provider
+ case $python::provider {
+ pip: {
+ package { 'python-virtualenv': ensure => latest, provider => pip }
}
default: {
package { 'python-virtualenv': ensure => $venv_ensure }