diff options
| author | Mickaël Canévet <mickael.canevet@camptocamp.com> | 2015-08-12 15:07:35 +0200 |
|---|---|---|
| committer | Mickaël Canévet <mickael.canevet@camptocamp.com> | 2015-08-12 15:07:35 +0200 |
| commit | ea07077f8427fc9807b9de8503f2f73dc0f7d1f8 (patch) | |
| tree | 0de3ee34aa802f0135c2d2bbe38e96dc6d8d6af3 /manifests | |
| parent | 2afa04fa07399f66917aa24ee6ca959ea38cc0ac (diff) | |
| parent | 3e23d677370d44b62495022338b8cc12f42bd30f (diff) | |
Merge pull request #54 from mcanevet/puppet4
Puppet4
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 21 | ||||
| -rw-r--r-- | manifests/lens.pp | 6 | ||||
| -rw-r--r-- | manifests/params.pp | 7 |
3 files changed, 22 insertions, 12 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 653925e..f927fe1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -14,12 +14,19 @@ class augeas ( $purge = true, ) inherits augeas::params { - anchor { 'augeas::begin': } -> - class {'::augeas::packages': } -> - class {'::augeas::files': } -> - anchor { 'augeas::end': } + if versioncmp($::puppetversion, '4.0.0') >= 0 { + anchor { 'augeas::begin': } -> + class {'::augeas::files': } -> + anchor { 'augeas::end': } + } else { + anchor { 'augeas::begin': } -> + class {'::augeas::packages': } -> + class {'::augeas::files': } -> + anchor { 'augeas::end': } + + # lint:ignore:spaceship_operator_without_tag + Package['ruby-augeas', $augeas::params::augeas_pkgs] -> Augeas <| |> + # lint:endignore + } - # lint:ignore:spaceship_operator_without_tag - Package['ruby-augeas', $augeas::params::augeas_pkgs] -> Augeas <| |> - # lint:endignore } diff --git a/manifests/lens.pp b/manifests/lens.pp index c7dd6b2..e2c34de 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -60,10 +60,6 @@ define augeas::lens ( mode => '0644', } - Exec { - path => $::path, - } - if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { validate_re( @@ -85,6 +81,7 @@ define augeas::lens ( exec { "Typecheck lens ${name}": command => "augparse -I ${augeas::lens_dir} ${lens_dest} || (rm -f ${lens_dest} && exit 1)", + path => $::path, refreshonly => true, subscribe => File[$lens_dest], } @@ -101,6 +98,7 @@ define augeas::lens ( exec { "Test lens ${name}": command => "augparse -I ${augeas::lens_dir} ${test_dest} || (rm -f ${lens_dest} && rm -f ${test_dest} && exit 1)", + path => $::path, refreshonly => true, subscribe => File[$lens_dest, $test_dest], } diff --git a/manifests/params.pp b/manifests/params.pp index 59023ab..4ca216d 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -3,7 +3,12 @@ # Default parameters for the Augeas module # class augeas::params { - $lens_dir = '/usr/share/augeas/lenses' + + if versioncmp($::puppetversion, '4.0.0') >= 0 { + $lens_dir = '/opt/puppetlabs/puppet/share/augeas/lenses' + } else { + $lens_dir = '/usr/share/augeas/lenses' + } case $::osfamily { 'RedHat': { |