Merge pull request #25 from retr0h/working
Re-"Revert "Foodcritic cleanups""
This commit is contained in:
		@@ -85,7 +85,7 @@ template "/etc/cinder/cinder.conf" do
 | 
				
			|||||||
    :glance_port => glance_api_endpoint.port
 | 
					    :glance_port => glance_api_endpoint.port
 | 
				
			||||||
  )
 | 
					  )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  notifies :restart, resources(:service => "cinder-api"), :delayed
 | 
					  notifies :restart, "service[cinder-api]"
 | 
				
			||||||
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_pass => service_pass
 | 
					    :service_pass => service_pass
 | 
				
			||||||
  )
 | 
					  )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  notifies :restart, resources(:service => "cinder-api"), :immediately
 | 
					  notifies :restart, "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, resources(:service => "cinder-scheduler")
 | 
					  notifies :restart, "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, resources(:service => "cinder-volume")
 | 
					  notifies :restart, "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, resources(:service => "iscsitarget"), :immediately
 | 
					  notifies :restart, "service[iscsitarget]", :immediately
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user