diff options
| author | Mickaël Canévet <mickael.canevet@camptocamp.com> | 2015-08-12 15:05:08 +0200 |
|---|---|---|
| committer | Mickaël Canévet <mickael.canevet@camptocamp.com> | 2015-08-12 15:05:08 +0200 |
| commit | 3e23d677370d44b62495022338b8cc12f42bd30f (patch) | |
| tree | 0de3ee34aa802f0135c2d2bbe38e96dc6d8d6af3 | |
| parent | 723382db55e6e3aebf9abdee83573f92f35071f1 (diff) | |
Always use $::path for exec
| -rw-r--r-- | manifests/lens.pp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/manifests/lens.pp b/manifests/lens.pp index 8c5733b..e2c34de 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -60,16 +60,6 @@ define augeas::lens ( mode => '0644', } - if versioncmp($::puppetversion, '4.0.0') >= 0 { - Exec { - path => "${::path}:/opt/puppetlabs/puppet/bin", - } - } else { - Exec { - path => $::path, - } - } - if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { validate_re( @@ -91,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], } @@ -107,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], } |