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

Merge pull request #24 from retr0h/working

Browse Source 
Added auth_host, auth_port, auth_scheme
This commit is contained in:
jaypipes
2013-01-07 14:25:58 -08:00
parent fd5433c302 d6b13a9a06
commit e0aa0cee1c
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
recipes/api.rb
View File

@@ -94,8 +94,8 @@ template "/etc/cinder/api-paste.ini" do
owner node["cinder"]["user"] owner node["cinder"]["user"]
mode 00644 mode 00644
variables( variables(
"auth_uri" => auth_uri, :identity_admin_endpoint => identity_admin_endpoint,
"service_password" => service_pass :service_pass => service_pass
) )
notifies :restart, resources(:service => "cinder-api"), :immediately notifies :restart, resources(:service => "cinder-api"), :immediately

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

@@ -45,7 +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_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_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 %>