diff options
author | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2015-08-31 16:19:02 +0200 |
---|---|---|
committer | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2015-08-31 16:19:02 +0200 |
commit | d918035d3abb026c334e090fb8ac29974e0f12d0 (patch) | |
tree | 25fa93b2ab5f0f63e6e063ff5137e89aafc608a9 | |
parent | 762de88d63ec7d75766a5a967a4f9b56b1f8011b (diff) |
is_pe is not defined in Puppet open-source
-rw-r--r-- | manifests/params.pp | 2 | ||||
-rw-r--r-- | spec/classes/augeas_spec.rb | 2 | ||||
-rw-r--r-- | spec/defines/augeas_lens_spec.rb | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/manifests/params.pp b/manifests/params.pp index cce558d..dc64f9c 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -6,7 +6,7 @@ class augeas::params { if versioncmp($::puppetversion, '4.0.0') >= 0 { $lens_dir = '/opt/puppetlabs/puppet/share/augeas/lenses' - } elsif (str2bool($::is_pe)) { + } 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 { diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index b7c8273..56870e0 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -7,7 +7,6 @@ describe 'augeas' do { :osfamily => 'MS-DOS', :puppetversion => Puppet.version, - :is_pe => false, } end @@ -23,7 +22,6 @@ describe 'augeas' do let(:facts) do facts.merge({ :puppetversion => Puppet.version, - :is_pe => false, }) end diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index 57747ca..f4e5be7 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -25,7 +25,6 @@ describe 'augeas::lens' do facts.merge({ :augeasversion => :undef, :puppetversion => Puppet.version, - :is_pe => false, }) end |