x/compass-adapters
Code Issues Proposed changes

fixed a bug in binding ip of keystone when HA enable

Browse Source 
Change-Id: I3fa77233d69c7ebcd4c4adba7b354411280cd860
This commit is contained in:
SamSu 2014-04-07 18:29:51 -07:00
parent 54cdeb7034
commit 6b99d63774
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chef/cookbooks/openstack-identity/recipes/server.rb
View File

@ -120,7 +120,11 @@ sql_connection = db_uri("identity", db_user, db_pass)
bootstrap_token = secret "secrets", "#{node['openstack']['identity']['admin_token']}"
ip_address = address_for node["openstack"]["identity"]["bind_interface"]
if node["openstack"]["ha"]["status"].eql?('enable')
ip_address = address_for node["openstack"]["identity"]["bind_interface"]
else
ip_address = node['openstack']['endpoints']['identity-api']['host']
end
# If the search role is set, we search for memcache
# servers via a Chef search. If not, we look at the

3
chef/cookbooks/openstack-identity/templates/default/keystone.conf.erb
View File

@ -4,8 +4,7 @@
public_port = <%= node["openstack"]["identity"]["service_port"] %>
admin_port = <%= node["openstack"]["identity"]["admin_port"] %>
admin_token = <%= @bootstrap_token %>
#bind_host = <%= @ip_address %>
bind_host = <%= node['openstack']['endpoints']['identity-api']['host'] %>
bind_host = <%= @ip_address %>
compute_port = 8774
verbose = <%= node["openstack"]["identity"]["verbose"] %>
debug = <%= node["openstack"]["identity"]["debug"] %>