openstack/cookbook-openstack-identity
Code Issues Proposed changes

Some fixups from testing in DAL2

Browse Source
This commit is contained in:
Jay Pipes
2013-03-15 19:54:31 -04:00
parent e4d3bd3c95
commit 8f9114df41
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
recipes/server.rb
View File

@@ -129,12 +129,12 @@ template "/etc/keystone/keystone.conf" do
end
uris = {
'identity-admin' => identity_admin_endpoint.to_s,
'identity' => identity_endpoint.to_s,
'image' => image_endpoint.to_s,
'compute' => compute_endpoint.to_s,
'ec2' => ec2_endpoint.to_s,
'volume' => volume_endpoint.to_s
'identity-admin' => identity_admin_endpoint.to_s.gsub('%25','%'),
'identity' => identity_endpoint.to_s.gsub('%25','%'),
'image' => image_endpoint.to_s.gsub('%25','%'),
'compute' => compute_endpoint.to_s.gsub('%25','%'),
'ec2' => ec2_endpoint.to_s.gsub('%25','%'),
'volume' => volume_endpoint.to_s.gsub('%25','%')
}
template "/etc/keystone/default_catalog.templates" do

2
templates/default/keystone.conf.erb
View File

@@ -54,7 +54,7 @@ driver = keystone.catalog.backends.templated.TemplatedCatalog
<% else -%>
driver = keystone.catalog.backends.<%= node['keystone']['catalog']['backend'] %>.Catalog
<% end -%>
template_file = /etc/keystone/default_catalog.template
template_file = /etc/keystone/default_catalog.templates
[token]
driver = keystone.token.backends.<%= node['keystone']['token']['backend'] %>.Token