Skip to content

Commit

Permalink
Merge pull request #202 from jjasghar/rerun_issue201
Browse files Browse the repository at this point in the history
Fix for Issue #201
  • Loading branch information
JJ Asghar committed Jan 28, 2015
2 parents d10fc82 + 3a3b041 commit 2b1f6f2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
1 change: 1 addition & 0 deletions Gemfile
Expand Up @@ -26,6 +26,7 @@ group :kitchen_cloud do
end

group :development do
gem 'chefspec'
gem 'ruby_gntp'
gem 'growl'
gem 'rb-fsevent'
Expand Down
1 change: 1 addition & 0 deletions Rakefile
Expand Up @@ -2,6 +2,7 @@ require 'rspec/core/rake_task'
require 'rubocop/rake_task'
require 'foodcritic'
require 'kitchen'
require 'chefspec'

# Style tests. Rubocop and Foodcritic
namespace :style do
Expand Down
14 changes: 4 additions & 10 deletions recipes/default.rb
Expand Up @@ -112,10 +112,6 @@ class Chef::Resource # rubocop:disable all
rpm_package "#{Chef::Config[:file_cache_path]}/rabbitmq-server-#{node['rabbitmq']['version']}-1.noarch.rpm"
end

service node['rabbitmq']['service_name'] do
action [:enable, :start]
end

when 'suse'
# rabbitmq-server-plugins needs to be first so they both get installed
# from the right repository. Otherwise, zypper will stop and ask for a
Expand All @@ -129,9 +125,6 @@ class Chef::Resource # rubocop:disable all
version node['rabbitmq']['version']
end

service node['rabbitmq']['service_name'] do
action [:enable, :start]
end
when 'smartos'
package 'rabbitmq'do
action :install
Expand All @@ -142,9 +135,6 @@ class Chef::Resource # rubocop:disable all
action :start
end

service node['rabbitmq']['service_name'] do
action [:enable, :start]
end
end

if node['rabbitmq']['logdir']
Expand Down Expand Up @@ -210,3 +200,7 @@ class Chef::Resource # rubocop:disable all
action :nothing
end
end

service node['rabbitmq']['service_name'] do
action [:enable, :start]
end

0 comments on commit 2b1f6f2

Please sign in to comment.