Skip to content

Commit

Permalink
Fixed foodcritic warnings, fixed failed converge issue, bumped versio…
Browse files Browse the repository at this point in the history
…n and added comments to changelog.
  • Loading branch information
MartinLewisNvm authored and MartinLewisNvm committed Jan 7, 2016
1 parent 375ec8f commit faf588e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ opsview_client CHANGELOG

This file is used to list changes made in each version of the opsview_client cookbook.

1.0.5
-----
- Martin Lewis - Guarded against flush_cache method not present in earlier versions of chef-client.

1.0.2
-----
- Tenyo Grozev - Add flush_cache to package installation in setup_rhel_agent.rb
Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
license 'Apache 2.0'
description 'Installs/Configures opsview agent'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '1.0.4'
version '1.0.5'

depends 'build-essential'
depends 'yum'
Expand Down
8 changes: 4 additions & 4 deletions recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@

# build-essential sets up prereqs for chef_gem
include_recipe 'build-essential::default'
chef_gem 'rest-client' do
compile_time true if Chef::Resource::ChefGem.instance_methods(false).include?(:compile_time) ~FC009
chef_gem 'rest-client' do #~FC009
compile_time true if Chef::Resource::ChefGem.instance_methods(false).include?(:compile_time)
end
chef_gem 'hashdiff' do
compile_time true if Chef::Resource::ChefGem.instance_methods(false).include?(:compile_time) ~FC009
chef_gem 'hashdiff' do #~FC009
compile_time true if Chef::Resource::ChefGem.instance_methods(false).include?(:compile_time)
end

# install the appropriate Opsview agent
Expand Down
4 changes: 2 additions & 2 deletions recipes/setup_rhel_agent.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@

# Install packages
node['opsview']['agent']['packages'].each do |pkg,ver|
package pkg do
package pkg do #~FC009
action :install
version ver if ver
options '--nogpgcheck'
flush_cache before: true if respond_to?(:flush_cache) ~FC009
flush_cache before: true if respond_to?(:flush_cache)
end
end

Expand Down

0 comments on commit faf588e

Please sign in to comment.