diff --git a/manifests/params.pp b/manifests/params.pp index 4dbd18ca5..3b0e70530 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -115,10 +115,7 @@ 'suse': { $user = 'icinga' $group = 'icinga' - $lib_dir = $::architecture ? { - 'x86_64' => '/usr/lib64', - default => '/usr/lib', - } + $lib_dir = '/usr/lib' } # Suse default: { diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index 63e789e6f..df16dee9b 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -51,11 +51,11 @@ .with_content %r{^const ManubulonPluginDir = \"/usr/lib64/nagios/plugins\"\n} } when 'Suse' it { is_expected.to contain_file(@constants_conf) - .with_content %r{^const PluginDir = \"/usr/lib64/nagios/plugins\"\n} } + .with_content %r{^const PluginDir = \"/usr/lib/nagios/plugins\"\n} } it { is_expected.to contain_file(@constants_conf) - .with_content %r{^const PluginContribDir = \"/usr/lib64/nagios/plugins\"\n} } + .with_content %r{^const PluginContribDir = \"/usr/lib/nagios/plugins\"\n} } it { is_expected.to contain_file(@constants_conf) - .with_content %r{^const ManubulonPluginDir = \"/usr/lib64/nagios/plugins\"\n} } + .with_content %r{^const ManubulonPluginDir = \"/usr/lib/nagios/plugins\"\n} } end it { is_expected.to contain_file(@constants_conf)