diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/lens.pp | 4 | ||||
| -rw-r--r-- | manifests/params.pp | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/manifests/lens.pp b/manifests/lens.pp index c374417..c7dd6b2 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -75,11 +75,13 @@ define augeas::lens ( $lens_dest = "${augeas::lens_dir}/${name}.aug" $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" + # lint:ignore:source_without_rights file { $lens_dest: ensure => $ensure, source => $lens_source, content => $lens_content, } + # lint:endignore exec { "Typecheck lens ${name}": command => "augparse -I ${augeas::lens_dir} ${lens_dest} || (rm -f ${lens_dest} && exit 1)", @@ -88,12 +90,14 @@ define augeas::lens ( } if $test_source or $test_content { + # lint:ignore:source_without_rights file { $test_dest: ensure => $ensure, source => $test_source, content => $test_content, notify => Exec["Test lens ${name}"], } + # lint:endignore exec { "Test lens ${name}": command => "augparse -I ${augeas::lens_dir} ${test_dest} || (rm -f ${lens_dest} && rm -f ${test_dest} && exit 1)", diff --git a/manifests/params.pp b/manifests/params.pp index e540033..59023ab 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -12,13 +12,13 @@ class augeas::params { } 'Suse': { - # RPM Sources: https://build.opensuse.org/project/show/systemsmanagement:puppet - # SLES 11 SP3 - if versioncmp($::rubyversion, '1.8.7') >= 0 { - $ruby_pkg = 'ruby1.8-rubygem-ruby-augeas' - # SLES 12 - } else { + # RPM Sources: https://build.opensuse.org/project/show/systemsmanagement:puppet + if versioncmp($::rubyversion, '2.1.2') >= 0 { + # SLES 12 / openSUSE $ruby_pkg = 'ruby2.1-rubygem-ruby-augeas' + } else { + # SLES 11 SP3 + $ruby_pkg = 'ruby1.8-rubygem-ruby-augeas' } $augeas_pkgs = ['augeas', 'augeas-lenses', 'libaugeas0' ] } |