diff --git a/attributes/default.rb b/attributes/default.rb index 67268d3..f2e4ce3 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -70,6 +70,8 @@ default["cinder"]["volume"]["volume_group"] = "cinder-volumes" default["cinder"]["volume"]["iscsi_helper"] = "tgtadm" case platform +# FC024: Probably won't be running this on Amazon. +# when "centos", "redhat", "amazon", "scientific" when "fedora", "redhat", "centos" default["cinder"]["platform"] = { "cinder_api_packages" => ["openstack-cinder", "python-cinderclient", "MySQL-python"], diff --git a/recipes/api.rb b/recipes/api.rb index ddc3a1c..8baa5eb 100644 --- a/recipes/api.rb +++ b/recipes/api.rb @@ -85,7 +85,7 @@ template "/etc/cinder/cinder.conf" do :glance_port => glance_api_endpoint.port ) - notifies :restart, resources(:service => "cinder-api"), :delayed + notifies :restart, service['cinder-api'] 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, resources(:service => "cinder-api"), :immediately + notifies :restart, service['cinder-api'], :immediately end keystone_register "Register Cinder Volume Service" do diff --git a/recipes/scheduler.rb b/recipes/scheduler.rb index 9cd91d5..d44cf7b 100644 --- a/recipes/scheduler.rb +++ b/recipes/scheduler.rb @@ -59,5 +59,5 @@ template "/etc/cinder/cinder.conf" do :glance_port => glance_api_endpoint.port ) - notifies :restart, resources(:service => "cinder-scheduler") + notifies :restart, service['cinder-scheduler'] end diff --git a/recipes/volume.rb b/recipes/volume.rb index d9f5aef..be70336 100644 --- a/recipes/volume.rb +++ b/recipes/volume.rb @@ -71,7 +71,7 @@ template "/etc/cinder/cinder.conf" do :glance_port => glance_api_endpoint.port ) - notifies :restart, resources(:service => "cinder-volume") + notifies :restart, 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, resources(:service => "iscsitarget"), :immediately + notifies :restart, service['iscsitarget'], :immediately end