Revert "Foodcritic cleanups"
This reverts commit 75659d82d5
.
Conflicts:
attributes/default.rb
This commit is contained in:
parent
517d5a7dc7
commit
519f1996ef
|
@ -85,7 +85,7 @@ template "/etc/cinder/cinder.conf" do
|
||||||
:glance_port => glance_api_endpoint.port
|
:glance_port => glance_api_endpoint.port
|
||||||
)
|
)
|
||||||
|
|
||||||
notifies :restart, service['cinder-api']
|
notifies :restart, resources(:service => "cinder-api"), :delayed
|
||||||
end
|
end
|
||||||
|
|
||||||
template "/etc/cinder/api-paste.ini" do
|
template "/etc/cinder/api-paste.ini" do
|
||||||
|
@ -98,7 +98,7 @@ template "/etc/cinder/api-paste.ini" do
|
||||||
"service_password" => service_pass
|
"service_password" => service_pass
|
||||||
)
|
)
|
||||||
|
|
||||||
notifies :restart, service['cinder-api'], :immediately
|
notifies :restart, resources(:service => "cinder-api"), :immediately
|
||||||
end
|
end
|
||||||
|
|
||||||
keystone_register "Register Cinder Volume Service" do
|
keystone_register "Register Cinder Volume Service" do
|
||||||
|
|
|
@ -59,5 +59,5 @@ template "/etc/cinder/cinder.conf" do
|
||||||
:glance_port => glance_api_endpoint.port
|
:glance_port => glance_api_endpoint.port
|
||||||
)
|
)
|
||||||
|
|
||||||
notifies :restart, service['cinder-scheduler']
|
notifies :restart, resources(:service => "cinder-scheduler")
|
||||||
end
|
end
|
||||||
|
|
|
@ -71,7 +71,7 @@ template "/etc/cinder/cinder.conf" do
|
||||||
:glance_port => glance_api_endpoint.port
|
:glance_port => glance_api_endpoint.port
|
||||||
)
|
)
|
||||||
|
|
||||||
notifies :restart, service['cinder-volume']
|
notifies :restart, resources(:service => "cinder-volume")
|
||||||
end
|
end
|
||||||
|
|
||||||
service "iscsitarget" do
|
service "iscsitarget" do
|
||||||
|
@ -85,5 +85,5 @@ template "/etc/tgt/targets.conf" do
|
||||||
source "targets.conf.erb"
|
source "targets.conf.erb"
|
||||||
mode 00600
|
mode 00600
|
||||||
|
|
||||||
notifies :restart, service['iscsitarget'], :immediately
|
notifies :restart, resources(:service => "iscsitarget"), :immediately
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue