diff options
| author | Mickaël Canévet <mickael.canevet@camptocamp.com> | 2016-05-27 09:04:08 +0200 |
|---|---|---|
| committer | Mickaël Canévet <mickael.canevet@camptocamp.com> | 2016-05-27 09:04:08 +0200 |
| commit | 7e86bedd8489eb47ea3e52b126bd20828d705eff (patch) | |
| tree | 8931b2727048bb92d0cf67eb91d6758ca30b1509 | |
| parent | 01f344c621d682168b7d19096cf6d4217af50d8e (diff) | |
Check for valid OS first
| -rw-r--r-- | manifests/params.pp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/manifests/params.pp b/manifests/params.pp index 0ae3feb..bf28630 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -4,15 +4,6 @@ # class augeas::params { - if versioncmp($::puppetversion, '4.0.0') >= 0 { - $lens_dir = '/opt/puppetlabs/puppet/share/augeas/lenses' - } elsif (defined('$is_pe') and str2bool("${::is_pe}")) { # lint:ignore:only_variable_string - # puppet enterpise has a different lens location - $lens_dir = '/opt/puppet/share/augeas/lenses' - } else { - $lens_dir = '/usr/share/augeas/lenses' - } - case $::osfamily { 'RedHat': { $ruby_pkg = $::operatingsystem ? { @@ -49,4 +40,14 @@ class augeas::params { default: { fail("Unsupported OS family: ${::osfamily}") } } + + if versioncmp($::puppetversion, '4.0.0') >= 0 { + $lens_dir = '/opt/puppetlabs/puppet/share/augeas/lenses' + } elsif (defined('$is_pe') and str2bool("${::is_pe}")) { # lint:ignore:only_variable_string + # puppet enterpise has a different lens location + $lens_dir = '/opt/puppet/share/augeas/lenses' + } else { + $lens_dir = '/usr/share/augeas/lenses' + } + } |