Browse files

Merge branch 'release13.02' of git://github.com/rightscale/rightscale…

…_cookbooks
  • Loading branch information...
2 parents 1d414d6 + aafd6a6 commit be0f5ce24a10f53736b17ddc6fff8a82495ce3a1 @ronniedada ronniedada committed Dec 14, 2012
View
2 cookbooks/db_mysql/definitions/db_mysql_set_mysql_read_only.rb
@@ -5,7 +5,7 @@
# RightScale Terms of Service available at http://www.rightscale.com/terms.php and,
# if applicable, other agreements such as a RightScale Master Subscription Agreement.
-define :db_mysql_set_mycnf_read_only, :read_only => false do
+define :db_mysql_set_mysql_read_only, :read_only => false do
read_only = params[:read_only] ? 1 : 0
log " Installing read_write_status.cnf with read_only = #{read_only}"
View
13 cookbooks/db_mysql/providers/default.rb
@@ -64,8 +64,13 @@
end
action :reset do
+ # Set read/write in read_write_status.cnf
+ db_mysql_set_mysql_read_only "setup mysql read/write" do
+ read_only false
+ end
+
# See cookbooks/db_mysql/libraries/helper.rb for the "init" method.
-# See "rightscale_tools" gem for the "reset" method.
+ # See "rightscale_tools" gem for the "reset" method.
@db = init(new_resource)
@db.reset(new_resource.name, node[:db_mysql][:datadir])
end
@@ -423,7 +428,7 @@
end
# Setup read_write_status.cnf
- db_mysql_set_mycnf_read_only "setup_mycnf_read_only" do
+ db_mysql_set_mysql_read_only "setup mysql read/write" do
read_only false
end
@@ -630,7 +635,7 @@
end
# Set read/write in read_write_status.cnf
- db_mysql_set_mycnf_read_only "setup_mycnf_read_only" do
+ db_mysql_set_mysql_read_only "setup mysql read/write" do
read_only false
end
@@ -836,7 +841,7 @@
end
# Set read_only in read_write_status.cnf
- db_mysql_set_mycnf_read_only "setup_mycnf_read_only" do
+ db_mysql_set_mysql_read_only "setup mysql read only" do
read_only true
end
View
1 cookbooks/lb_clb/templates/default/clb_attach_exec.erb
@@ -1,3 +1,4 @@
+#!/bin/bash
#
# Cookbook Name:: lb_clb
#
View
1 cookbooks/lb_clb/templates/default/clb_detach_exec.erb
@@ -1,3 +1,4 @@
+#!/bin/bash
#
# Cookbook Name:: lb_clb
#
View
BIN cookbooks/rightscale/files/default/rightscale_tools-1.4.8.gem
Binary file not shown.
View
BIN cookbooks/rightscale/files/default/rightscale_tools-1.4.9.gem
Binary file not shown.
View
2 cookbooks/rightscale/recipes/install_tools.rb
@@ -19,7 +19,7 @@
# rightscale_tools gem
RS_TOOLS_GEM = "rightscale_tools"
-RS_TOOLS_VERSION = "1.4.8"
+RS_TOOLS_VERSION = "1.4.9"
COOKBOOK_DEFAULT_GEMS = ::File.join(::File.dirname(__FILE__), "..", "files", "default")

0 comments on commit be0f5ce

Please sign in to comment.