Skip to content

Commit

Permalink
[0.9.12] use override instead of set (normal)
Browse files Browse the repository at this point in the history
  • Loading branch information
portertech committed Apr 11, 2013
1 parent 73ef679 commit 4f2cbed
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
Empty file added .kitchen/logs/kitchen.log
Empty file.
4 changes: 2 additions & 2 deletions recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@
mode 0644
end
else
node.set.sensu.rabbitmq.ssl = nil
node.override.sensu.rabbitmq.ssl = nil
if node.sensu.rabbitmq.port == 5671
Chef::Log.warn("Setting Sensu RabbitMQ port to 5672 as you have disabled SSL.")
node.set.sensu.rabbitmq.port = 5672
node.override.sensu.rabbitmq.port = 5672
end
end

Expand Down
6 changes: 3 additions & 3 deletions recipes/rabbitmq.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#

if node.sensu.use_ssl
node.set.rabbitmq.ssl = true
node.set.rabbitmq.ssl_port = node.sensu.rabbitmq.port
node.override.rabbitmq.ssl = true
node.override.rabbitmq.ssl_port = node.sensu.rabbitmq.port

ssl_directory = "/etc/rabbitmq/ssl"

Expand All @@ -39,7 +39,7 @@
content ssl["server"][item]
mode 0644
end
node.set.rabbitmq["ssl_#{item}"] = path
node.override.rabbitmq["ssl_#{item}"] = path
end
end

Expand Down
10 changes: 5 additions & 5 deletions recipes/redis.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
# limitations under the License.
#

node.set.redis.config.bind = "0.0.0.0"
node.set.redis.config.port = node.sensu.redis.port
node.override.redis.config.bind = "0.0.0.0"
node.override.redis.config.port = node.sensu.redis.port

if node.platform == "ubuntu" && node.platform_version <= "10.04"
node.set.redis.install_type = "source"
node.override.redis.install_type = "source"
elsif node.platform == "debian"
node.set.redis.install_type = "source"
node.override.redis.install_type = "source"
else
node.set.redis.install_type = "package"
node.override.redis.install_type = "package"
end

include_recipe "redis::server"

0 comments on commit 4f2cbed

Please sign in to comment.