use new bind_address method from common
* use bind_address method to get address from interface or fallback to configured host Change-Id: Ib181edbd003f6ff703389871666671249884c542
This commit is contained in:
parent
66ed38fb89
commit
e30222057e
|
@ -94,6 +94,7 @@ auth_url =
|
||||||
db_user = node['openstack']['db']['network']['username']
|
db_user = node['openstack']['db']['network']['username']
|
||||||
db_pass = get_password 'db', 'neutron'
|
db_pass = get_password 'db', 'neutron'
|
||||||
bind_service = node['openstack']['bind_service']['all']['network']
|
bind_service = node['openstack']['bind_service']['all']['network']
|
||||||
|
bind_service_address = bind_address bind_service
|
||||||
|
|
||||||
# The auth_url in nova section follows auth_plugin
|
# The auth_url in nova section follows auth_plugin
|
||||||
nova_auth_url = nil
|
nova_auth_url = nil
|
||||||
|
@ -110,7 +111,7 @@ node.default['openstack']['network']['conf'].tap do |conf|
|
||||||
if node['openstack']['network']['syslog']['use']
|
if node['openstack']['network']['syslog']['use']
|
||||||
conf['DEFAULT']['log_config'] = '/etc/openstack/logging.conf'
|
conf['DEFAULT']['log_config'] = '/etc/openstack/logging.conf'
|
||||||
end
|
end
|
||||||
conf['DEFAULT']['bind_host'] = bind_service.host
|
conf['DEFAULT']['bind_host'] = bind_service_address
|
||||||
conf['DEFAULT']['bind_port'] = bind_service.port
|
conf['DEFAULT']['bind_port'] = bind_service.port
|
||||||
conf['nova']['auth_url'] = nova_auth_url
|
conf['nova']['auth_url'] = nova_auth_url
|
||||||
conf['keystone_authtoken']['auth_url'] = auth_url
|
conf['keystone_authtoken']['auth_url'] = auth_url
|
||||||
|
|
Loading…
Reference in New Issue