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

Merge pull request #10 from jaypipes/working

Browse Source 
When merging setup and api recipes, forgot to include keystone role conf...
This commit is contained in:
John Dewey
2012-12-11 16:57:08 -08:00
parent ada59de6a4 b32bad62a8
commit 24b526c5a4
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
recipes/api.rb
View File

@@ -56,10 +56,10 @@ db_pass = db_info["db"]["password"]
sql_connection = db_uri("volume", db_user, db_pass) sql_connection = db_uri("volume", db_user, db_pass)
rabbit_server_role = node["cinder"]["rabbit_server_chef_role"] rabbit_server_role = node["cinder"]["rabbit_server_chef_role"]
rabbit_info = get_settings_by_role rabbit_server_role, "queue" rabbit_info = config_by_role rabbit_server_role, "queue"
glance_api_role = node["cinder"]["glance_api_chef_role"] glance_api_role = node["cinder"]["glance_api_chef_role"]
glance = get_settings_by_role glance_api_role, "glance" glance = config_by_role glance_api_role, "glance"
glance_api_endpoint = endpoint "image-api" glance_api_endpoint = endpoint "image-api"
template "/etc/cinder/cinder.conf" do template "/etc/cinder/cinder.conf" do
@@ -94,6 +94,9 @@ template "/etc/cinder/api-paste.ini" do
notifies :restart, resources(:service => "cinder-api"), :immediately notifies :restart, resources(:service => "cinder-api"), :immediately
end end
keystone_service_role = node["cinder"]["keystone_service_chef_role"]
keystone = config_by_role keystone_service_role, "keystone"
keystone_register "Register Cinder Volume Service" do keystone_register "Register Cinder Volume Service" do
auth_host identity_admin_endpoint.host auth_host identity_admin_endpoint.host
auth_port identity_admin_endpoint.port.to_s auth_port identity_admin_endpoint.port.to_s