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

Cleaned up per jay's suggestions

Browse Source
This commit is contained in:
John Dewey
2013-01-07 14:19:16 -08:00
parent 7dd2b286ab
commit d6b13a9a06
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
recipes/api.rb
View File

@@ -67,8 +67,7 @@ identity_admin_endpoint = endpoint "identity-admin"
ksadmin_user = keystone["admin_user"] ksadmin_user = keystone["admin_user"]
ksadmin_tenant_name = keystone["admin_tenant_name"] ksadmin_tenant_name = keystone["admin_tenant_name"]
ksadmin_pass = user_password ksadmin_user ksadmin_pass = user_password ksadmin_user
raw_auth_uri = ::URI.decode identity_admin_endpoint auth_uri = ::URI.decode identity_admin_endpoint.to_s
auth_uri = raw_auth_uri.to_s
cinder_api_endpoint = endpoint "volume-api" cinder_api_endpoint = endpoint "volume-api"
service_pass = service_password "cinder" service_pass = service_password "cinder"
@@ -95,8 +94,7 @@ template "/etc/cinder/api-paste.ini" do
owner node["cinder"]["user"] owner node["cinder"]["user"]
mode 00644 mode 00644
variables( variables(
:raw_auth_uri => raw_auth_uri, :identity_admin_endpoint => identity_admin_endpoint,
:auth_uri => auth_uri,
:service_pass => service_pass :service_pass => service_pass
) )

7
templates/default/api-paste.ini.erb
View File

@@ -45,10 +45,9 @@ paste.filter_factory = cinder.api.auth:CinderKeystoneContext.factory
# when keystoneclient packages are updated (which contain the middleware, not # when keystoneclient packages are updated (which contain the middleware, not
# the Keystone server package...) # the Keystone server package...)
paste.filter_factory = keystone.middleware.auth_token:filter_factory paste.filter_factory = keystone.middleware.auth_token:filter_factory
auth_host = <%= @raw_auth_uri.host %> auth_host = <%= @identity_admin_endpoint.host %>
auth_port = <%= @raw_auth_uri.port %> auth_port = <%= @identity_admin_endpoint.port %>
auth_protocol = <%= @raw_auth_uri.scheme %> auth_protocol = <%= @identity_admin_endpoint.scheme %>
auth_uri = <%= @auth_uri %>
admin_tenant_name = <%= node["cinder"]["service_tenant_name"] %> admin_tenant_name = <%= node["cinder"]["service_tenant_name"] %>
admin_user = <%= node["cinder"]["service_user"] %> admin_user = <%= node["cinder"]["service_user"] %>
admin_password = <%= @service_pass %> admin_password = <%= @service_pass %>