diff options
author | Jarl Stefansson <jarl@sdelements.com> | 2013-11-08 18:32:32 -0500 |
---|---|---|
committer | Jarl Stefansson <jarl@sdelements.com> | 2013-11-08 18:32:32 -0500 |
commit | 69d2a1447cb3b72fc25ebf19f6f82a35ef4aeb1f (patch) | |
tree | 6f6bf00292cffebdc76a034327b6a2cfb07b4d82 | |
parent | 0f83afd92aeea4af35795f881f9eaa408d4082c3 (diff) |
Added full pip install support for all packages
-rw-r--r-- | manifests/install.pp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/manifests/install.pp b/manifests/install.pp index ba4ff87..8bc1b49 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -10,8 +10,6 @@ class python::install { /(?i:Debian|Ubuntu)/ => "${python}-dev" } - package { $python: ensure => present } - $dev_ensure = $python::dev ? { true => present, default => absent, @@ -22,9 +20,6 @@ class python::install { default => absent, } - package { $pythondev: ensure => $dev_ensure } - package { 'python-pip': ensure => $pip_ensure } - $venv_ensure = $python::virtualenv ? { true => present, default => absent, @@ -33,10 +28,16 @@ class python::install { # Install latest from pip if pip is the provider case $python::provider { pip: { - package { 'virtualenv': ensure => latest, provider => pip } + package { 'virtualenv': ensure => latest, provider => pip } + package { 'pip': ensure => latest, provider => pip } + package { $pythondev: ensure => latest } + package { "python==${python::version}": ensure => latest, provider => pip } } default: { package { 'python-virtualenv': ensure => $venv_ensure } + package { 'python-pip': ensure => $pip_ensure } + package { $pythondev: ensure => $dev_ensure } + package { $python: ensure => present } } } |