diff options
author | Sergey Stankevich <sergey@stankevi.ch> | 2013-06-12 11:41:30 -0700 |
---|---|---|
committer | Sergey Stankevich <sergey@stankevi.ch> | 2013-06-12 11:41:30 -0700 |
commit | 5d26f95cd38676bfd8191e3c150db488429ae099 (patch) | |
tree | 1af4bec30a71cc260eb0cf96052b00602ef02ada /manifests/install.pp | |
parent | 9aae0a0b63657a81225a2a670c9a9c89bbed2ff4 (diff) | |
parent | 07e6cc6b3d2afa25be0ae829c5bff8385c2815f3 (diff) |
Merge pull request #20 from fgimian/master
Stability & performance improvements along with a few new features (take what you wish)
Diffstat (limited to 'manifests/install.pp')
-rw-r--r-- | manifests/install.pp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/manifests/install.pp b/manifests/install.pp index cf0a13e..9306e3a 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -6,8 +6,8 @@ class python::install { } $pythondev = $::operatingsystem ? { - /(?i:RedHat|CentOS|Fedora)/ => "$python-devel", - /(?i:Debian|Ubuntu)/ => "$python-dev" + /(?i:RedHat|CentOS|Fedora)/ => "${python}-devel", + /(?i:Debian|Ubuntu)/ => "${python}-dev" } package { $python: ensure => present } @@ -17,7 +17,13 @@ class python::install { default => absent, } - package { [ $pythondev, 'python-pip' ]: ensure => $dev_ensure } + $pip_ensure = $python::pip ? { + true => present, + default => absent, + } + + package { $pythondev: ensure => $dev_ensure } + package { 'python-pip': ensure => $pip_ensure } $venv_ensure = $python::virtualenv ? { true => present, |