Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

drop legacy precise code #891

Merged
merged 1 commit into from Oct 1, 2019
Merged

drop legacy precise code #891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions manifests/plugin/curl_json.pp
View file
Open in desktop
Expand Up @@ -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' {
Expand Down
10 changes: 1 addition & 9 deletions spec/defines/collectd_plugin_curl_json_spec.rb
View file
Open in desktop
@@ -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
Expand Down