Merge "Use the Common endpoint bare-metal-api-bind"
This commit is contained in:
commit
8241c41e7c
|
@ -71,6 +71,7 @@ auth_uri = auth_uri_transform(identity_endpoint.to_s, node['openstack']['bare-me
|
||||||
identity_uri = identity_uri_transform(identity_admin_endpoint)
|
identity_uri = identity_uri_transform(identity_admin_endpoint)
|
||||||
|
|
||||||
network_endpoint = internal_endpoint 'network-api' || {}
|
network_endpoint = internal_endpoint 'network-api' || {}
|
||||||
|
api_bind = internal_endpoint 'bare-metal-api-bind'
|
||||||
|
|
||||||
template '/etc/ironic/ironic.conf' do
|
template '/etc/ironic/ironic.conf' do
|
||||||
source 'ironic.conf.erb'
|
source 'ironic.conf.erb'
|
||||||
|
@ -78,6 +79,8 @@ template '/etc/ironic/ironic.conf' do
|
||||||
group node['openstack']['bare-metal']['group']
|
group node['openstack']['bare-metal']['group']
|
||||||
mode 00640
|
mode 00640
|
||||||
variables(
|
variables(
|
||||||
|
api_bind_address: api_bind.host,
|
||||||
|
api_bind_port: api_bind.port,
|
||||||
db_connection: db_connection,
|
db_connection: db_connection,
|
||||||
mq_service_type: mq_service_type,
|
mq_service_type: mq_service_type,
|
||||||
mq_password: mq_password,
|
mq_password: mq_password,
|
||||||
|
|
|
@ -60,6 +60,15 @@ describe 'openstack-bare-metal::ironic-common' do
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'has the default api attributes' do
|
||||||
|
[
|
||||||
|
/^host_ip=127.0.0.1$/,
|
||||||
|
/^port=6385$/
|
||||||
|
].each do |line|
|
||||||
|
expect(chef_run).to render_config_file(file.name).with_section_content('api', line)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
it 'has the default glance attributes' do
|
it 'has the default glance attributes' do
|
||||||
[
|
[
|
||||||
/^glance_host=127.0.0.1$/,
|
/^glance_host=127.0.0.1$/,
|
||||||
|
|
|
@ -522,10 +522,10 @@ log_dir=<%= node['openstack']['bare-metal']['log_dir'] %>
|
||||||
#
|
#
|
||||||
|
|
||||||
# The listen IP for the Ironic API server. (string value)
|
# The listen IP for the Ironic API server. (string value)
|
||||||
#host_ip=0.0.0.0
|
host_ip=<%= @api_bind_address %>
|
||||||
|
|
||||||
# The port for the Ironic API server. (integer value)
|
# The port for the Ironic API server. (integer value)
|
||||||
#port=6385
|
port=<%= @api_bind_port %>
|
||||||
|
|
||||||
# The maximum number of items returned in a single response
|
# The maximum number of items returned in a single response
|
||||||
# from a collection resource. (integer value)
|
# from a collection resource. (integer value)
|
||||||
|
|
Loading…
Reference in New Issue