Merge "Drop admin endpoints"
This commit is contained in:
commit
9840d394e7
|
@ -25,14 +25,14 @@ default['openstack']['bare_metal']['custom_template_banner'] = "
|
||||||
# Do not edit, changes will be overwritten
|
# Do not edit, changes will be overwritten
|
||||||
"
|
"
|
||||||
|
|
||||||
%w(admin internal public).each do |ep_type|
|
%w(internal public).each do |ep_type|
|
||||||
# host for openstack admin/internal/public bare metal endpoint
|
# host for openstack internal/public bare metal endpoint
|
||||||
default['openstack']['endpoints'][ep_type]['bare_metal']['host'] = '127.0.0.1'
|
default['openstack']['endpoints'][ep_type]['bare_metal']['host'] = '127.0.0.1'
|
||||||
# scheme for openstack admin/internal/public bare metal endpoint
|
# scheme for openstack internal/public bare metal endpoint
|
||||||
default['openstack']['endpoints'][ep_type]['bare_metal']['scheme'] = 'http'
|
default['openstack']['endpoints'][ep_type]['bare_metal']['scheme'] = 'http'
|
||||||
# port for openstack admin/internal/public bare metal endpoint
|
# port for openstack internal/public bare metal endpoint
|
||||||
default['openstack']['endpoints'][ep_type]['bare_metal']['port'] = 6385
|
default['openstack']['endpoints'][ep_type]['bare_metal']['port'] = 6385
|
||||||
# path for openstack admin/internal/public bare metal endpoint
|
# path for openstack internal/public bare metal endpoint
|
||||||
default['openstack']['endpoints'][ep_type]['bare_metal']['path'] = ''
|
default['openstack']['endpoints'][ep_type]['bare_metal']['path'] = ''
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -125,7 +125,7 @@ end
|
||||||
# ******************** OpenStack Bare Metal Endpoints *****************************
|
# ******************** OpenStack Bare Metal Endpoints *****************************
|
||||||
|
|
||||||
# The OpenStack Bare Metal (Ironic) API endpoint
|
# The OpenStack Bare Metal (Ironic) API endpoint
|
||||||
%w(public internal admin).each do |ep_type|
|
%w(public internal).each do |ep_type|
|
||||||
default['openstack']['endpoints'][ep_type]['bare_metal']['scheme'] = 'http'
|
default['openstack']['endpoints'][ep_type]['bare_metal']['scheme'] = 'http'
|
||||||
default['openstack']['endpoints'][ep_type]['bare_metal']['path'] = ''
|
default['openstack']['endpoints'][ep_type]['bare_metal']['path'] = ''
|
||||||
default['openstack']['endpoints'][ep_type]['bare_metal']['host'] = '127.0.0.1'
|
default['openstack']['endpoints'][ep_type]['bare_metal']['host'] = '127.0.0.1'
|
||||||
|
|
|
@ -34,13 +34,6 @@ platform_options['ironic_api_packages'].each do |pkg|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
directory '/var/cache/ironic' do
|
|
||||||
owner node['openstack']['bare_metal']['user']
|
|
||||||
group node['openstack']['bare_metal']['group']
|
|
||||||
mode 00700
|
|
||||||
action :create
|
|
||||||
end
|
|
||||||
|
|
||||||
service 'ironic-api' do
|
service 'ironic-api' do
|
||||||
service_name platform_options['ironic_api_service']
|
service_name platform_options['ironic_api_service']
|
||||||
action [:disable, :stop]
|
action [:disable, :stop]
|
||||||
|
|
|
@ -30,7 +30,6 @@ auth_url = ::URI.decode identity_endpoint.to_s
|
||||||
interfaces = {
|
interfaces = {
|
||||||
public: { url: public_endpoint('bare_metal') },
|
public: { url: public_endpoint('bare_metal') },
|
||||||
internal: { url: internal_endpoint('bare_metal') },
|
internal: { url: internal_endpoint('bare_metal') },
|
||||||
admin: { url: admin_endpoint('bare_metal') },
|
|
||||||
}
|
}
|
||||||
service_pass = get_password 'service', 'openstack-bare-metal'
|
service_pass = get_password 'service', 'openstack-bare-metal'
|
||||||
region = node['openstack']['bare_metal']['region']
|
region = node['openstack']['bare_metal']['region']
|
||||||
|
@ -40,6 +39,7 @@ admin_user = node['openstack']['identity']['admin_user']
|
||||||
admin_pass = get_password 'user', node['openstack']['identity']['admin_user']
|
admin_pass = get_password 'user', node['openstack']['identity']['admin_user']
|
||||||
admin_project = node['openstack']['identity']['admin_project']
|
admin_project = node['openstack']['identity']['admin_project']
|
||||||
admin_domain = node['openstack']['identity']['admin_domain_name']
|
admin_domain = node['openstack']['identity']['admin_domain_name']
|
||||||
|
endpoint_type = node['openstack']['identity']['endpoint_type']
|
||||||
service_domain_name = node['openstack']['bare_metal']['conf']['keystone_authtoken']['user_domain_name']
|
service_domain_name = node['openstack']['bare_metal']['conf']['keystone_authtoken']['user_domain_name']
|
||||||
service_role = node['openstack']['bare_metal']['service_role']
|
service_role = node['openstack']['bare_metal']['service_role']
|
||||||
service_name = node['openstack']['bare_metal']['service_name']
|
service_name = node['openstack']['bare_metal']['service_name']
|
||||||
|
@ -51,6 +51,7 @@ connection_params = {
|
||||||
openstack_api_key: admin_pass,
|
openstack_api_key: admin_pass,
|
||||||
openstack_project_name: admin_project,
|
openstack_project_name: admin_project,
|
||||||
openstack_domain_name: admin_domain,
|
openstack_domain_name: admin_domain,
|
||||||
|
openstack_endpoint_type: endpoint_type,
|
||||||
}
|
}
|
||||||
|
|
||||||
# Register Bare Metal Service
|
# Register Bare Metal Service
|
||||||
|
|
|
@ -36,14 +36,6 @@ describe 'openstack-bare-metal::api' do
|
||||||
expect(chef_run).to upgrade_package('ironic-api')
|
expect(chef_run).to upgrade_package('ironic-api')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'should create the directory /var/cache/ironic' do
|
|
||||||
expect(chef_run).to create_directory('/var/cache/ironic').with(
|
|
||||||
user: 'ironic',
|
|
||||||
group: 'ironic',
|
|
||||||
mode: 00700
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'disables ironic api on boot' do
|
it 'disables ironic api on boot' do
|
||||||
expect(chef_run).to disable_service('ironic-api')
|
expect(chef_run).to disable_service('ironic-api')
|
||||||
end
|
end
|
||||||
|
|
|
@ -16,6 +16,7 @@ describe 'openstack-bare-metal::identity_registration' do
|
||||||
openstack_api_key: 'admin_test_pass',
|
openstack_api_key: 'admin_test_pass',
|
||||||
openstack_project_name: 'admin',
|
openstack_project_name: 'admin',
|
||||||
openstack_domain_name: 'default',
|
openstack_domain_name: 'default',
|
||||||
|
openstack_endpoint_type: 'internalURL',
|
||||||
}
|
}
|
||||||
service_name = 'bare_metal'
|
service_name = 'bare_metal'
|
||||||
service_project = 'ironic'
|
service_project = 'ironic'
|
||||||
|
|
Loading…
Reference in New Issue