prepare 0.5.3

update tresuredata GPG key

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.5.3
+* update treasure data repo gpg key
+
+## 0.5.2
+* Correct the docs related to the service_enable parameter
+
+## 0.5.1
+* Allow to install specific version of fluent gem plugins
+
 ## 0.5.0
 * Added support for Debian 6, 7, 8
 * Added support for CentOS 6, 7

Gemfile

@@ -5,6 +5,17 @@ gem 'puppet', puppetversion
 gem 'puppetlabs_spec_helper', '>= 0.8.2'
 gem 'puppet-lint', '>= 1.0.0'
 gem 'facter', '>= 1.7.0'
-gem 'beaker-rspec'
 gem 'beaker-puppet_install_helper'
 gem 'metadata-json-lint'
+
+beakerrspec = '> 0'
+platforms [:ruby_19, :ruby_21] do
+  beakerrspec = '<= 5.6.0'
+end
+gem 'beaker-rspec', beakerrspec
+
+platforms :ruby_19 do
+  gem 'public_suffix', '< 1.5.0', :platforms => :ruby_19
+  gem 'nokogiri', '< 1.7.0', :platforms => :ruby_19
+  gem 'mime-types', '< 3.0', :platforms => :ruby_19
+end

README.md

@@ -79,7 +79,7 @@ include '::fluentd'
   Service ensure.
   **Default:** 'running'
  
-`service_enabled`
+`service_enable`
 
   Defines if the service should be enabled.
   **Default:** 'true'
@@ -228,7 +228,8 @@ This module gives you the possibility to install plugins as gem or files.
 **gem installation**
 ```puppet
 ::fluentd::plugin { 'fluent-plugin-elasticsearch':
-  type => 'gem'
+  type => 'gem',
+  ensure => '0.1.3'
 }
 ```
 **file installation**

Rakefile

@@ -1,6 +1,7 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.send('disable_puppet_url_without_modules')
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
 
 desc "Validate manifests, templates, and ruby files"

examples/plugin.pp

@@ -5,5 +5,5 @@
 # file installation
 ::fluentd::plugin { 'fluent-plugin-elasticsearch':
   type   => 'file',
-  source => 'puppet:///path/to/plugin'
+  source => 'puppet://path/to/plugin'
 }

manifests/init.pp

@@ -26,7 +26,7 @@
 # [*service_ensure*]
 #   Service ensure
 #   Default: 'running'
-# [*service_enabled*]
+# [*service_enable*]
 #   Defines if the service should be enabled
 #   Default: 'true'
 # [*user_manage*]

manifests/plugin.pp

@@ -31,11 +31,6 @@ define fluentd::plugin (
   $source = undef,
 ) {
 
-  # parameter validation
-  if ! ($ensure in [ 'present', 'absent' ]) {
-    fail('ensure parameter must be present or absent')
-  }
-
   case $type {
     'gem': {
       fluentd::plugin::gem { $name:
@@ -44,6 +39,10 @@ define fluentd::plugin (
       }
     }
     'file': {
+      # parameter validation
+      if ! ($ensure in [ 'present', 'absent' ]) {
+        fail('ensure parameter must be present or absent')
+      }
       validate_string($source)
 
       fluentd::plugin::file { $name:

manifests/repo/apt.pp

@@ -7,7 +7,7 @@ class fluentd::repo::apt (
   $repos        = 'contrib',
   $architecture = $::architecture,
   $key          = {
-    'id'     => 'C901622B5EC4AF820C38AB861093DB45A12E206F',
+    'id'     => 'BEE682289B2217F45AF4CC3F901F9177AB97ACBE',
     'source' => 'http://packages.treasuredata.com/GPG-KEY-td-agent'
   },
   $include      = {

manifests/repo/yum.pp

@@ -23,4 +23,11 @@ class fluentd::repo::yum (
     path        => '/bin:/usr/bin/',
     refreshonly => true,
   }
+
+  exec { 'remove old GPG key':
+    command => 'rpm -e --allmatches gpg-pubkey-a12e206f-*',
+    onlyif  => 'rpm -qi gpg-pubkey-a12e206f-*',
+    notify  => Exec['add GPG key'],
+  }
+
 }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "wywygmbh-fluentd",
-  "version": "0.5.0",
+  "version": "0.5.3",
   "author": "wywy GmbH",
   "summary": "Generic module for fluentd (td-agent).",
   "license": "Apache-2.0",

spec/classes/fluentd_config_spec.rb

@@ -27,6 +27,7 @@ describe 'fluentd::config', :type => :class do
         :lsbdistid       => 'Ubuntu',
         :operatingsystem => 'Ubuntu',
         :lsbdistcodename => 'precise',
+        :architecture    => 'amd64',
       }
     }
 

spec/classes/fluentd_install_spec.rb

@@ -19,6 +19,7 @@ describe 'fluentd::install', :type => :class do
         :lsbdistid       => 'Ubuntu',
         :operatingsystem => 'Ubuntu',
         :lsbdistcodename => 'precise',
+        :architecture    => 'amd64',
       }
     }
     include_examples 'when called with no parameters'

spec/classes/fluentd_repo_apt_spec.rb

@@ -21,7 +21,7 @@ describe 'fluentd::repo::apt', :type => :class do
         'repos'        => 'contrib',
         'architecture' => 'amd64',
         'key'          => {
-          'id'     => 'C901622B5EC4AF820C38AB861093DB45A12E206F',
+          'id'     => 'BEE682289B2217F45AF4CC3F901F9177AB97ACBE',
           'source' => 'http://packages.treasuredata.com/GPG-KEY-td-agent'
         },
         'include'      => {

spec/classes/fluentd_repo_spec.rb

@@ -9,6 +9,7 @@ describe 'fluentd::repo', :type => :class do
         :lsbdistid       => 'Ubuntu',
         :operatingsystem => 'Ubuntu',
         :lsbdistcodename => 'precise',
+        :architecture    => 'amd64',
       }
     }
     it {

spec/classes/fluentd_service_spec.rb

@@ -20,6 +20,7 @@ describe 'fluentd::config', :type => :class do
         :lsbdistid       => 'Ubuntu',
         :operatingsystem => 'Ubuntu',
         :lsbdistcodename => 'precise',
+        :architecture    => 'amd64',
       }
     }
 

spec/classes/fluentd_spec.rb

@@ -17,6 +17,7 @@ describe 'fluentd', :type => :class do
         :lsbdistid       => 'Ubuntu',
         :operatingsystem => 'Ubuntu',
         :lsbdistcodename => 'precise',
+        :architecture    => 'amd64',
       }
     }
 

spec/classes/fluentd_user_spec.rb

@@ -18,6 +18,7 @@ describe 'fluentd::user', :type => :class do
         :lsbdistid       => 'Ubuntu',
         :operatingsystem => 'Ubuntu',
         :lsbdistcodename => 'precise',
+        :architecture    => 'amd64',
       }
     }
 

spec/defines/filter_spec.rb

@@ -7,6 +7,7 @@ describe 'fluentd::filter' do
       :lsbdistid       => 'Ubuntu',
       :operatingsystem => 'Ubuntu',
       :lsbdistcodename => 'precise',
+      :architecture    => 'amd64',
     }
   }
   let(:pre_condition) { 'include fluentd' }

spec/defines/match_spec.rb

@@ -7,6 +7,7 @@ describe 'fluentd::match' do
       :lsbdistid       => 'Ubuntu',
       :operatingsystem => 'Ubuntu',
       :lsbdistcodename => 'precise',
+      :architecture    => 'amd64',
     }
   }
   let(:pre_condition) { 'include fluentd' }

spec/defines/plugin_spec.rb

@@ -7,6 +7,7 @@ describe 'fluentd::plugin' do
       :lsbdistid       => 'Ubuntu',
       :operatingsystem => 'Ubuntu',
       :lsbdistcodename => 'precise',
+      :architecture    => 'amd64',
     }
   }
   let(:pre_condition) { 'include fluentd' }

spec/defines/source_spec.rb

@@ -7,6 +7,7 @@ describe 'fluentd::source' do
       :lsbdistid       => 'Ubuntu',
       :operatingsystem => 'Ubuntu',
       :lsbdistcodename => 'precise',
+      :architecture    => 'amd64',
     }
   }
   let(:pre_condition) { 'include fluentd' }