diff options
-rw-r--r-- | manifests/base.pp | 5 | ||||
-rw-r--r-- | manifests/debian.pp | 2 | ||||
-rw-r--r-- | manifests/init.pp | 5 | ||||
-rw-r--r-- | manifests/redhat.pp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 65b9ae6..3f75ad6 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,6 +1,11 @@ class augeas::base { $lens_dir = '/usr/share/augeas/lenses/contrib' + $version = $augeas_version ? { + '' => 'present', + default => $augeas_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 c1c0347..78f74d7 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -2,7 +2,7 @@ class augeas::debian inherits augeas::base { package { ['augeas-lenses', 'libaugeas0', 'augeas-tools']: - ensure => "${augeas::version}", + ensure => "${augeas::base::version}", before => File['/usr/share/augeas/lenses/contrib'], } diff --git a/manifests/init.pp b/manifests/init.pp index cc46069..85936e9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,10 +1,5 @@ class augeas { - $version = $augeas_version ? { - '' => 'present', - default => $augeas_version - } - $rubylib_version = $augeas_ruby_version ? { '' => 'present', default => $augeas_ruby_version diff --git a/manifests/redhat.pp b/manifests/redhat.pp index c2bf0e6..f70f43b 100644 --- a/manifests/redhat.pp +++ b/manifests/redhat.pp @@ -2,7 +2,7 @@ class augeas::redhat inherits augeas::base { package { ['augeas', 'augeas-libs']: - ensure => "${augeas::version}", + ensure => "${augeas::base::version}", before => File['/usr/share/augeas/lenses/contrib'], } package { 'ruby-augeas': ensure => "${augeas::rubylib_version}" } |