Use new bind_address method from Common to get address

* fixed my_ip attribute. now using the cinder_api_bind_address

Change-Id: Id85a23ae284157b6277a43b3ee3b10bc0e43655c
This commit is contained in:
Christoph Albers 2016-02-18 14:18:25 +01:00
parent 0d6cffad4e
commit 502d7a0824
2 changed files with 3 additions and 2 deletions

View File

@ -5,7 +5,6 @@ default['openstack']['block-storage']['conf'].tap do |conf|
conf['DEFAULT']['log_config'] = '/etc/openstack/logging.conf' conf['DEFAULT']['log_config'] = '/etc/openstack/logging.conf'
end end
conf['DEFAULT']['rpc_backend'] = node['openstack']['mq']['service_type'] conf['DEFAULT']['rpc_backend'] = node['openstack']['mq']['service_type']
conf['DEFAULT']['my_ip'] = '127.0.0.1'
conf['DEFAULT']['auth_strategy'] = 'keystone' conf['DEFAULT']['auth_strategy'] = 'keystone'
conf['DEFAULT']['control_exchange'] = 'cinder' conf['DEFAULT']['control_exchange'] = 'cinder'
conf['DEFAULT']['volume_group'] = 'cinder-volumes' conf['DEFAULT']['volume_group'] = 'cinder-volumes'

View File

@ -52,6 +52,7 @@ end
glance_api_endpoint = internal_endpoint 'image_api' glance_api_endpoint = internal_endpoint 'image_api'
cinder_api_bind = node['openstack']['bind_service']['all']['block-storage'] cinder_api_bind = node['openstack']['bind_service']['all']['block-storage']
cinder_api_bind_address = bind_address cinder_api_bind
identity_endpoint = public_endpoint 'identity' identity_endpoint = public_endpoint 'identity'
node.default['openstack']['block-storage']['conf_secrets'] node.default['openstack']['block-storage']['conf_secrets']
.[]('keystone_authtoken')['password'] = .[]('keystone_authtoken')['password'] =
@ -68,8 +69,9 @@ end
node.default['openstack']['block-storage']['conf'].tap do |conf| node.default['openstack']['block-storage']['conf'].tap do |conf|
conf['DEFAULT']['glance_host'] = glance_api_endpoint.host conf['DEFAULT']['glance_host'] = glance_api_endpoint.host
conf['DEFAULT']['glance_port'] = glance_api_endpoint.port conf['DEFAULT']['glance_port'] = glance_api_endpoint.port
conf['DEFAULT']['my_ip'] = cinder_api_bind_address
conf['DEFAULT']['glance_api_servers'] = "#{glance_api_endpoint.scheme}://#{glance_api_endpoint.host}:#{glance_api_endpoint.port}" conf['DEFAULT']['glance_api_servers'] = "#{glance_api_endpoint.scheme}://#{glance_api_endpoint.host}:#{glance_api_endpoint.port}"
conf['DEFAULT']['osapi_volume_listen'] = cinder_api_bind.host conf['DEFAULT']['osapi_volume_listen'] = cinder_api_bind_address
conf['DEFAULT']['osapi_volume_listen_port'] = cinder_api_bind.port conf['DEFAULT']['osapi_volume_listen_port'] = cinder_api_bind.port
conf['keystone_authtoken']['auth_url'] = auth_url conf['keystone_authtoken']['auth_url'] = auth_url
end end