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

Merge pull request #11 from jaypipes/working

Browse Source 
Corrects api_endpoint -> cinder_api_endpoint
This commit is contained in:
John Dewey
2012-12-11 17:08:27 -08:00
parent 24b526c5a4 5a08b6fef6
commit a6624507c9
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
recipes/api.rb
View File

@@ -80,6 +80,7 @@ end
identity_admin_endpoint = endpoint "identity-admin"
identity_endpoint = endpoint "identity-api"
cinder_api_endpoint = endpoint "volume-api"
template "/etc/cinder/api-paste.ini" do
source "api-paste.ini.erb"
@@ -107,9 +108,9 @@ keystone_register "Register Cinder Volume Service" do
service_type "volume"
service_description "Cinder Volume Service"
endpoint_region node["cinder"]["region"]
endpoint_adminurl ::URI.decode api_endpoint.to_s
endpoint_internalurl ::URI.decode api_endpoint.to_s
endpoint_publicurl ::URI.decode api_endpoint.to_s
endpoint_adminurl ::URI.decode cinder_api_endpoint.to_s
endpoint_internalurl ::URI.decode cinder_api_endpoint.to_s
endpoint_publicurl ::URI.decode cinder_api_endpoint.to_s
action :create_service
end
@@ -124,9 +125,9 @@ keystone_register "Register Cinder Volume Endpoint" do
service_type "volume"
service_description "Cinder Volume Service"
endpoint_region node["cinder"]["region"]
endpoint_adminurl ::URI.decode api_endpoint.to_s
endpoint_internalurl ::URI.decode api_endpoint.to_s
endpoint_publicurl ::URI.decode api_endpoint.to_s
endpoint_adminurl ::URI.decode cinder_api_endpoint.to_s
endpoint_internalurl ::URI.decode cinder_api_endpoint.to_s
endpoint_publicurl ::URI.decode cinder_api_endpoint.to_s
action :create_endpoint
end