openstack
/
cookbook-openstack-block-storage
Code Issues Proposed changes

Revert "Foodcritic cleanups" 

This reverts commit 75659d82d5.

Conflicts:

	attributes/default.rb
This commit is contained in:
Jay Pipes 2013-01-07 11:22:27 -05:00
parent 517d5a7dc7
commit 519f1996ef
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes/api.rb
View File

@ -85,7 +85,7 @@ template "/etc/cinder/cinder.conf" do
:glance_port => glance_api_endpoint.port
)
notifies :restart, service['cinder-api']
notifies :restart, resources(:service => "cinder-api"), :delayed
end
template "/etc/cinder/api-paste.ini" do
@ -98,7 +98,7 @@ template "/etc/cinder/api-paste.ini" do
"service_password" => service_pass
)
notifies :restart, service['cinder-api'], :immediately
notifies :restart, resources(:service => "cinder-api"), :immediately
end
keystone_register "Register Cinder Volume Service" do

2
recipes/scheduler.rb
View File

@ -59,5 +59,5 @@ template "/etc/cinder/cinder.conf" do
:glance_port => glance_api_endpoint.port
)
notifies :restart, service['cinder-scheduler']
notifies :restart, resources(:service => "cinder-scheduler")
end

4
recipes/volume.rb
View File

@ -71,7 +71,7 @@ template "/etc/cinder/cinder.conf" do
:glance_port => glance_api_endpoint.port
)
notifies :restart, service['cinder-volume']
notifies :restart, resources(:service => "cinder-volume")
end
service "iscsitarget" do
@ -85,5 +85,5 @@ template "/etc/tgt/targets.conf" do
source "targets.conf.erb"
mode 00600
notifies :restart, service['iscsitarget'], :immediately
notifies :restart, resources(:service => "iscsitarget"), :immediately
end