Skip to content

Commit fb6df76

Browse files
committed
acu91715 - modified rightscale_marker on missing recipes
1 parent ce5c48d commit fb6df76

File tree

4 files changed

+5
-12
lines changed

4 files changed

+5
-12
lines changed

cookbooks/chef/recipes/do_client_converge.rb

+2-4
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
# http://www.rightscale.com/terms.php and, if applicable, other agreements
77
# such as a RightScale Master Subscription Agreement.
88

9-
rightscale_marker :begin
9+
rightscale_marker
1010

1111
log " Current Chef Client role(s) are: #{node[:chef][:client][:current_roles]}"
1212

1313
# Updates runlist.json file with new roles.
14-
if node[:chef][:client][:current_roles] != node[:chef][:client][:roles]
14+
if node[:chef][:client][:current_roles] != node[:chef][:client][:roles]
1515

1616
# Creates runlist.json file.
1717
template "#{node[:chef][:client][:config_dir]}/runlist.json" do
@@ -35,5 +35,3 @@
3535
execute "run chef client" do
3636
command "chef-client -j #{node[:chef][:client][:config_dir]}/runlist.json"
3737
end
38-
39-
rightscale_marker :end

cookbooks/copyright

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@
66
# http://www.rightscale.com/terms.php and, if applicable, other agreements
77
# such as a RightScale Master Subscription Agreement.
88

9-
rightscale_marker :begin
10-
rightscale_marker :end
9+
rightscale_marker

cookbooks/memcached/recipes/do_restart.rb

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@
66
# http://www.rightscale.com/terms.php and, if applicable, other agreements
77
# such as a RightScale Master Subscription Agreement.
88

9-
rightscale_marker :begin
9+
rightscale_marker
1010

1111
log " memcached: restarting"
1212

1313
# Calls the memcached service restart command
1414
service "memcached" do
1515
action :restart
1616
end
17-
18-
rightscale_marker :end

cookbooks/web_apache/recipes/do_disable_maintenance_mode.rb

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# http://www.rightscale.com/terms.php and, if applicable, other agreements
77
# such as a RightScale Master Subscription Agreement.
88

9-
rightscale_marker :begin
9+
rightscale_marker
1010

1111
# Removes maintenance.html file.
1212
log " Removing #{node[:web_apache][:maintenance_file]}"
@@ -15,5 +15,3 @@
1515
backup false
1616
only_if { ::File.exists?(node[:web_apache][:maintenance_file]) }
1717
end
18-
19-
rightscale_marker :end

0 commit comments

Comments
 (0)