Add neutron url attribute for ironic

Change-Id: I46f5de1bcff5735f37e75deca931f59aa3ff0c81
Closes-bug: #1450323
This commit is contained in:
wenchma 2015-04-30 14:47:34 +08:00
parent 8d3f085f46
commit a9bfbaab9a
3 changed files with 8 additions and 1 deletions

View File

@ -70,6 +70,8 @@ service_pass = get_password 'service', 'openstack-bare-metal'
auth_uri = auth_uri_transform(identity_endpoint.to_s, node['openstack']['bare-metal']['api']['auth']['version'])
identity_uri = identity_uri_transform(identity_admin_endpoint)
network_endpoint = internal_endpoint 'network-api' || {}
template '/etc/ironic/ironic.conf' do
source 'ironic.conf.erb'
owner node['openstack']['bare-metal']['user']
@ -80,6 +82,7 @@ template '/etc/ironic/ironic.conf' do
mq_service_type: mq_service_type,
mq_password: mq_password,
rabbit_hosts: rabbit_hosts,
network_endpoint: network_endpoint,
glance_protocol: image_endpoint.scheme,
glance_host: image_endpoint.host,
glance_port: image_endpoint.port,

View File

@ -97,6 +97,10 @@ describe 'openstack-bare-metal::ironic-common' do
end
end
it 'has default neutron attributes' do
expect(chef_run).to render_config_file(file.name).with_section_content('neutron', %r(^url=http://127.0.0.1:9696$))
end
context 'tftp' do
before do
node.set['openstack']['bare-metal']['tftp']['enabled'] = true

View File

@ -1118,7 +1118,7 @@ signing_dir=<%= node['openstack']['bare-metal']['api']['auth']['cache_dir'] %>
#
# URL for connecting to neutron. (string value)
#url=http://$my_ip:9696
url=<%= @network_endpoint %>
# Timeout value for connecting to neutron in seconds. (integer
# value)