openstack
/
cookbook-openstack-identity
Code Issues Proposed changes

Use endpoint for setting compute and ec2 port 

To be consistent with recent changes in
commit: d706b87f9d57efff21bbbd3df1800362b55d8e74
Original change was commit: f67346f092945cc8221705be269d8e0003fcb9e5

For endpoints, use the endpoint.port for setting for in conf files
instead of directly accessing the common default attributes.

Change-Id: I78dab813928923c9eef15275fbe0c2e2b6dfe776
This commit is contained in:
Mark Vanderwiel 2014-03-24 18:02:32 -05:00
parent 8f9e0fb8e1
commit bad7236565
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes/server.rb
View File

@ -149,7 +149,9 @@ template '/etc/keystone/keystone.conf' do
memcache_servers: memcache_servers,
uris: uris,
public_endpoint: public_endpoint,
public_port: identity_endpoint.port,
admin_endpoint: admin_endpoint,
admin_port: identity_admin_endpoint.port,
ldap: node['openstack']['identity']['ldap'],
token_expiration: node['openstack']['identity']['token']['expiration']
)

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

@ -1,8 +1,8 @@
<%= node["openstack"]["identity"]["custom_template_banner"] %>
[DEFAULT]
public_port = <%= node['openstack']['endpoints']['identity-api']['port'] %>
admin_port = <%= node['openstack']['endpoints']['identity-admin']['port'] %>
public_port = <%= @public_port %>
admin_port = <%= @admin_port %>
admin_token = <%= @bootstrap_token %>
bind_host = <%= @bind_address %>
compute_port = 8774