diff options
| author | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2012-04-05 17:05:40 +0200 |
|---|---|---|
| committer | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2012-04-05 17:09:18 +0200 |
| commit | 1e52552f1f34768afc2e34466dc737099fd38db9 (patch) | |
| tree | 5c98bd9bac897ea3de5b04765bd155c3d533e3ef /manifests | |
| parent | 613aaefb99961b714cb322754a647442790f90f0 (diff) | |
Also put $augeas::ruby_version into augeas::base
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/base.pp | 5 | ||||
| -rw-r--r-- | manifests/debian.pp | 2 | ||||
| -rw-r--r-- | manifests/init.pp | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 3f75ad6..85b8c12 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -6,6 +6,11 @@ class augeas::base { default => $augeas_version } + $rubylib_version = $augeas_ruby_version ? { + '' => 'present', + default => $augeas_ruby_version + } + # ensure no file not managed by puppet ends up in there. file { $lens_dir: ensure => directory, diff --git a/manifests/debian.pp b/manifests/debian.pp index 78f74d7..76b215c 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -6,6 +6,6 @@ class augeas::debian inherits augeas::base { before => File['/usr/share/augeas/lenses/contrib'], } - package {'libaugeas-ruby1.8': ensure => "${augeas::rubylib_version}" } + package {'libaugeas-ruby1.8': ensure => "${augeas::base::rubylib_version}" } } diff --git a/manifests/init.pp b/manifests/init.pp index 85936e9..7919625 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,10 +1,4 @@ class augeas { - - $rubylib_version = $augeas_ruby_version ? { - '' => 'present', - default => $augeas_ruby_version - } - case $operatingsystem { /RedHat|CentOS|Fedora/: { include augeas::redhat } /Debian|Ubuntu|kFreeBSD/: { include augeas::debian } |