Update module-collectd to 91e1daf

91e1daf Merge pull request redhat-openstack#245 from danielspang/master
3f60606 Only set LogSendErrors option if collectd version >= 5.4.
59ab73e Merge pull request redhat-openstack#244 from arioch/fix_travis_depr_ruby
e41495e Drop Ruby 1.8.7 support
2dff362 TravisCI shouldn't trip over deprecated technology
6bcf615 Package collectd-python is no longer available in EPEL

Puppetfile

@@ -83,7 +83,7 @@ mod 'memcached',
   :git => 'https://github.com/saz/puppet-memcached.git'
 
 mod 'module-collectd',
-  :commit => '1830403421c03c10a00552075e164214e97c86da',
+  :commit => '91e1dafad3182e64979dfeba1633f0b32bcc0649',
   :git => 'https://github.com/pdxcat/puppet-module-collectd.git'
 
 mod 'module-data',

module-collectd/.travis.yml

@@ -6,10 +6,6 @@ script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 2.0.0

module-collectd/manifests/plugin/python.pp

@@ -11,12 +11,6 @@
 
   validate_hash($config)
 
-  if $::osfamily == 'Redhat' {
-    package { 'collectd-python':
-      ensure => $ensure,
-    }
-  }
-
   $conf_dir = $collectd::params::plugin_conf_dir
 
   # This is deprecated file naming ensuring old style file removed, and should be removed in next major relese

module-collectd/templates/plugin/write_graphite.conf.erb

@@ -10,8 +10,8 @@
     StoreRates <%=  @storerates %>
     AlwaysAppendDS <%= @alwaysappendds %>
     SeparateInstances <%= @separateinstances %>
-    LogSendErrors <%= @logsenderrors %>
 <% if @collectd_version and (scope.function_versioncmp([@collectd_version, '5.4']) >= 0) -%>
+    LogSendErrors <%= @logsenderrors %>
     Protocol "<%= @protocol %>"
 <% end -%>
   </Carbon>