summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/init.pp8
-rw-r--r--manifests/packages.pp20
2 files changed, 8 insertions, 20 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 41178ee..4289765 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -8,10 +8,10 @@
# ['lens_dir'] - the lens directory to use
# ['purge'] - whether to purge lens directories
class augeas (
- $version = $augeas_version,
- $ruby_version = $augeas_ruby_version,
- $lens_dir = $augeas::params::lens_dir,
- $purge = true,
+ $version = present,
+ $ruby_version = present,
+ $lens_dir = $augeas::params::lens_dir,
+ $purge = true,
) inherits augeas::params {
class {'::augeas::packages': } ->
diff --git a/manifests/packages.pp b/manifests/packages.pp
index 91dbb74..ff8628d 100644
--- a/manifests/packages.pp
+++ b/manifests/packages.pp
@@ -3,24 +3,12 @@
# Sets up packages for Augeas
#
class augeas::packages {
- # Augeas packages
- $augeas_ensure = $augeas::version ? {
- '' => 'present',
- default => $augeas::version
- }
-
- package { $augeas::params::augeas_pkgs:
- ensure => $augeas_ensure,
- }
-
- # Ruby package
- $ruby_ensure = $augeas::ruby_version ? {
- '' => 'present',
- default => $augeas::ruby_version
+ package { $::augeas::params::augeas_pkgs:
+ ensure => $::augeas::version,
}
package { 'ruby-augeas':
- ensure => $ruby_ensure,
- name => $augeas::params::ruby_pkg,
+ ensure => $::augeas::ruby_version,
+ name => $::augeas::params::ruby_pkg,
}
}