diff --git a/manifests/plugin/curl_json.pp b/manifests/plugin/curl_json.pp index a4182140b..b8495be69 100644 --- a/manifests/plugin/curl_json.pp +++ b/manifests/plugin/curl_json.pp @@ -25,11 +25,7 @@ if $_manage_package { if $facts['os']['family'] == 'Debian' { - $libyajl_package = $facts['os']['distro']['codename'] ? { - 'precise' => 'libyajl1', - default => 'libyajl2' - } - ensure_packages($libyajl_package) + ensure_packages('libyajl2') } if $facts['os']['family'] == 'RedHat' { diff --git a/spec/defines/collectd_plugin_curl_json_spec.rb b/spec/defines/collectd_plugin_curl_json_spec.rb index 6c5f30ee6..3a2458fea 100644 --- a/spec/defines/collectd_plugin_curl_json_spec.rb +++ b/spec/defines/collectd_plugin_curl_json_spec.rb @@ -1,15 +1,7 @@ require 'spec_helper' -# Facter 2 doesn't include the os.distro fact so override the facter version we tell facterdb to use. -facterdb_facterversion = case Puppet.version - when %r{^4} - '3.6.7' - else - '3.8.0' - end - describe 'collectd::plugin::curl_json', type: :define do - on_supported_os(facterversion: facterdb_facterversion).each do |os, facts| + on_supported_os.each do |os, facts| context "on #{os} " do options = os_specific_options(facts) let :facts do