diff options
| author | Sergey Stankevich <stankevich@users.noreply.github.com> | 2014-01-03 03:32:33 -0800 |
|---|---|---|
| committer | Sergey Stankevich <stankevich@users.noreply.github.com> | 2014-01-03 03:32:33 -0800 |
| commit | 2bab9c9a03cd01450877d897399c68f37fea0ff7 (patch) | |
| tree | 6ea9d2426f36eebd43ba44258955491ab5be7994 | |
| parent | 80ee7bcdf5ca4287432da9d2e06c3bb6c1dd8a91 (diff) | |
| parent | e165f319501eda83ca1e996fa2c4cd06341657f9 (diff) | |
Merge pull request #48 from davideme/master
Add support for Amazon distro by using osfamily instead operatingsytem fact
| -rw-r--r-- | manifests/init.pp | 4 | ||||
| -rw-r--r-- | manifests/install.pp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 9fe0420..451bdda 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -44,8 +44,8 @@ class python ( ) { # Module compatibility check - $compatible = [ 'Debian', 'Ubuntu', 'CentOS', 'RedHat', 'Scientific' ] - if ! ($::operatingsystem in $compatible) { + $compatible = [ 'Debian', 'RedHat'] + if ! ($::osfamily in $compatible) { fail("Module is not compatible with ${::operatingsystem}") } diff --git a/manifests/install.pp b/manifests/install.pp index bb5f090..b2debcc 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -20,9 +20,9 @@ class python::install { default => "python${python::version}", } - $pythondev = $::operatingsystem ? { - /(?i:RedHat|CentOS|Fedora|Scientific)/ => "${python}-devel", - /(?i:Debian|Ubuntu)/ => "${python}-dev" + $pythondev = $::osfamily ? { + RedHat => "${python}-devel", + Debian => "${python}-dev" } $dev_ensure = $python::dev ? { |