Skip to content

Commit

Permalink
[rabbitmq_acl] removed chef-sugar
Browse files Browse the repository at this point in the history
  • Loading branch information
portertech committed Jan 23, 2015
1 parent 7f1ee13 commit 69b32f8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
3 changes: 0 additions & 3 deletions metadata.rb
Expand Up @@ -21,9 +21,6 @@
# available @ http://supermarket.chef.io/cookbooks/redisio
depends "redisio", ">= 1.7.0"

# available @ https://supermarket.chef.io/cookbooks/chef-sugar
depends "chef-sugar"

# available @ https://supermarket.chef.io/cookbooks/chef-vault
suggests "chef-vault", "~> 1.1.5"

Expand Down
8 changes: 4 additions & 4 deletions recipes/rabbitmq.rb
Expand Up @@ -17,8 +17,6 @@
# limitations under the License.
#

include_recipe "chef-sugar"

group "rabbitmq"

if node.sensu.use_ssl
Expand Down Expand Up @@ -52,7 +50,9 @@

# The packaged erlang in 12.04 (and below) is vulnerable to
# the poodle exploit which stops rabbitmq starting its SSL listener
node.override.erlang.install_method = "esl" if ubuntu_before_trusty?
if node.platform == "ubuntu" && node.platform_version <= "12.04"
node.override.erlang.install_method = "esl"
end

include_recipe "rabbitmq"
include_recipe "rabbitmq::mgmt_console"
Expand All @@ -66,7 +66,7 @@
if node.sensu.use_acl
# something nifty
else
rabbitmq = Array(node.sensu.rabbitmq).first.to_hash
rabbitmq = [node.sensu.rabbitmq].flatten.first.to_hash

config = Sensu::Helpers.data_bag_item("config", true)

Expand Down

0 comments on commit 69b32f8

Please sign in to comment.