Browse files

Bumps Riak to 1.1.2 and fixes error with haproxy.conf

  • Loading branch information...
1 parent 6a2dcd2 commit 9cdcd493f7b1af6fc29aa2af60af4d9176214214 Ines Sombra committed Jun 14, 2012
Showing with 18 additions and 7 deletions.
  1. +2 −2 cookbooks/riak/README.md
  2. +14 −1 cookbooks/riak/attributes/riak.rb
  3. +2 −4 cookbooks/riak/recipes/haproxy.rb
View
4 cookbooks/riak/README.md
@@ -19,7 +19,7 @@ Design
* 3+ utility instances 64-bit (m1.large +) running
-* Riak 1.0.2 w/ defaults to leveldb
+* Riak 1.1.2 w/ defaults to leveldb
* Erlang R140B3 (installed from a custom binary package)
* haproxy is configured on 8097-8098 (pbc,http) with the http back-end using /ping to ensure the back-end is up.
@@ -119,4 +119,4 @@ How to get Support
[7]: https://github.com/engineyard/ey-cloud-recipes/blob/master/cookbooks/riak/recipes/default.rb#L6
[8]: https://github.com/engineyard/ey-cloud-recipes/blob/master/cookbooks/riak/recipes/default.rb#51
[9]: http://wiki.basho.com/The-Riak-Fast-Track.html
-[10]: https://support.cloud.engineyard.com
+[10]: https://support.cloud.engineyard.com
View
15 cookbooks/riak/attributes/riak.rb
@@ -1 +1,14 @@
-riak :version => "1.0.3", :data_root => "/data/riak/data", :map_js_vm_count => "8", :reduce_js_vm_count => "6", :hook_js_vm_count => "2", :js_max_vm_mem => "8", :js_thread_stack => "16", :riak_kv_stat => "true", :legacy_stats => "false", :legacy_keylisting => "false", :luwak_enabled => "false", :riaksearch_enabled => "false", :backend_enabled => "riak_kv_eleveldb_backend", :pb_backlog => "64"
+riak :version => "1.1.2",
+ :data_root => "/data/riak/data",
+ :map_js_vm_count => "8",
+ :reduce_js_vm_count => "6",
+ :hook_js_vm_count => "2",
+ :js_max_vm_mem => "8",
+ :js_thread_stack => "16",
+ :riak_kv_stat => "true",
+ :legacy_stats => "false",
+ :legacy_keylisting => "false",
+ :luwak_enabled => "false",
+ :riaksearch_enabled => "false",
+ :backend_enabled => "riak_kv_eleveldb_backend",
+ :pb_backlog => "64"
View
6 cookbooks/riak/recipes/haproxy.rb
@@ -11,9 +11,8 @@
action :upgrade
end
- riak_instances = []
- riak_instances << node["engineyard"]["environment"]["instances"].map{|x| x["private_hostname"] if x["name"] =~ /^riak_/ }.compact
-
+ riak_instances = node["engineyard"]["environment"]["instances"].map{|x| x["private_hostname"] if x["name"] =~ /^riak_/ }.compact
+
template "/etc/haproxy_riak.cfg" do
owner 'root'
group 'root'
@@ -25,7 +24,6 @@
:haproxy_pass => node[:haproxy][:password]
})
end
-
template "/etc/monit.d/haproxy_riak.monitrc" do
source "haproxy_monitrc.erb"
backup 0

0 comments on commit 9cdcd49

Please sign in to comment.