Cleaned up per jay's suggestions

recipes/api.rb

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

templates/default/api-paste.ini.erb

@@ -45,10 +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 %>
+auth_host = <%= @identity_admin_endpoint.host %>
+auth_port = <%= @identity_admin_endpoint.port %>
+auth_protocol = <%= @identity_admin_endpoint.scheme %>
 admin_tenant_name = <%= node["cinder"]["service_tenant_name"] %>
 admin_user = <%= node["cinder"]["service_user"] %>
 admin_password = <%= @service_pass %>