From a0e9b8c1958966d0d783f1d71b7b5fe3be7ba02a Mon Sep 17 00:00:00 2001 From: Fotis Gimian Date: Mon, 3 Jun 2013 19:38:35 +1000 Subject: Added braces around python variable to avoid Puppet syntax errors in install manifest --- manifests/install.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/install.pp') diff --git a/manifests/install.pp b/manifests/install.pp index cf0a13e..6454377 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 } -- cgit v1.2.3 From 17debdc04506a2bfd4297b7620acffdbd01c9176 Mon Sep 17 00:00:00 2001 From: Fotis Gimian Date: Tue, 4 Jun 2013 10:20:38 +1000 Subject: Made the pip package independent from the dev package in the python class and updated version to 1.1.1 --- manifests/install.pp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'manifests/install.pp') diff --git a/manifests/install.pp b/manifests/install.pp index 6454377..9306e3a 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -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, -- cgit v1.2.3