diff --git a/recipes/api.rb b/recipes/api.rb
index ddc3a1c..18adf08 100644
--- a/recipes/api.rb
+++ b/recipes/api.rb
@@ -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
diff --git a/templates/default/api-paste.ini.erb b/templates/default/api-paste.ini.erb
index 0ef667b..03769aa 100644
--- a/templates/default/api-paste.ini.erb
+++ b/templates/default/api-paste.ini.erb
@@ -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"] %>