diff --git a/.fixtures.yml b/.fixtures.yml index 7b0deef..f5ffde8 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -6,5 +6,8 @@ fixtures: apt: repo: "git://github.com/puppetlabs/puppetlabs-apt.git" ref: "4.1.0" + yumrepo_core: + repo: "git://github.com/puppetlabs/puppetlabs-yumrepo_core.git" + ref: "1.0.3" symlinks: fluentd: "#{source_dir}" diff --git a/lib/puppet/provider/package/tdagent.rb b/lib/puppet/provider/package/tdagent.rb index 16ae15a..bc8fcf4 100644 --- a/lib/puppet/provider/package/tdagent.rb +++ b/lib/puppet/provider/package/tdagent.rb @@ -1,7 +1,7 @@ -# This file must be compatible with Ruby 1.8.7 in order to work on EL6. -module Puppet::Parser::Functions - Puppet::Type.type(:package).provide :tdagent, :parent => :gem, :source => :gem do - has_feature :install_options, :versionable - commands :gemcmd => '/opt/td-agent/usr/sbin/td-agent-gem' - end +require 'puppet' +require 'puppet/provider/package' + +Puppet::Type.type(:package).provide :tdagent, :parent => :gem, :source => :gem do + has_feature :install_options, :versionable + commands :gemcmd => '/opt/td-agent/usr/sbin/td-agent-gem' end diff --git a/metadata.json b/metadata.json index e21ee99..355c7d7 100644 --- a/metadata.json +++ b/metadata.json @@ -8,6 +8,10 @@ { "name": "puppetlabs/apt", "version_requirement": ">= 2.0.0 < 5.0.0" + }, + { + "name": "puppetlabs/yumrepo_core", + "version_requirement": ">= 1.0.0 < 2.0.0" } ], "issues_url": "https://github.com/soylent/konstantin-fluentd/issues", diff --git a/spec/acceptance/nodesets/centos-6-x64.yml b/spec/acceptance/nodesets/centos-6-x64.yml index 11a8583..ebb9181 100644 --- a/spec/acceptance/nodesets/centos-6-x64.yml +++ b/spec/acceptance/nodesets/centos-6-x64.yml @@ -6,7 +6,7 @@ HOSTS: docker_preserve_image: true docker_cmd: '["/sbin/init"]' docker_image_commands: - - 'yum install -y tar' + - 'yum install -y tar ruby ruby-devel make gcc' CONFIG: log_level: verbose type: foss diff --git a/spec/acceptance/nodesets/centos-7-x64.yml b/spec/acceptance/nodesets/centos-7-x64.yml index 4ebe189..279791b 100644 --- a/spec/acceptance/nodesets/centos-7-x64.yml +++ b/spec/acceptance/nodesets/centos-7-x64.yml @@ -6,7 +6,7 @@ HOSTS: docker_preserve_image: true docker_cmd: '["/sbin/init"]' docker_image_commands: - - 'yum install -y initscripts' + - 'yum install -y initscripts ruby ruby-devel make gcc' CONFIG: log_level: verbose type: foss diff --git a/spec/defines/plugin_spec.rb b/spec/defines/plugin_spec.rb index 8fd63fc..cd51921 100644 --- a/spec/defines/plugin_spec.rb +++ b/spec/defines/plugin_spec.rb @@ -2,6 +2,7 @@ RSpec.describe 'fluentd::plugin' do let(:title) { 'fluent-plugin-test' } + let(:pre_condition) { 'include ::fluentd' } context 'with redhat', :redhat do it { is_expected.to contain_package(title).with(provider: 'tdagent') } diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index a56808a..2e94f6d 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -14,6 +14,7 @@ hosts.each do |host| on host, puppet('module', 'install', 'puppetlabs-stdlib') on host, puppet('module', 'install', 'puppetlabs-apt') + on host, puppet('module', 'install', 'puppetlabs-yumrepo_core') end end end