Added auth_host, auth_port, auth_scheme

This is required for middleware to work properly
This commit is contained in:
John Dewey 2013-01-07 13:54:39 -08:00
parent fd5433c302
commit 7dd2b286ab
2 changed files with 8 additions and 3 deletions

View File

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

View File

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