Simplify identity endpoint

Per the Keystone Install Guide[1] the admin endpoint is superseded in
favor of a single public endpoint. As a result, the admin endpoint is no
longer deployed by default.

[1] https://docs.openstack.org/keystone/queens/install/keystone-install-ubuntu.html#install-and-configure-components

Change-Id: Ic2733d94e776eaa50ad8e4a39e6d2a8c18a45d89
Implements: blueprint simplify-identity-endpoint
This commit is contained in:
Samuel Cassiba 2018-06-12 22:23:55 -07:00
parent 13fe1087c1
commit a5d4ce3bd2
5 changed files with 14 additions and 19 deletions

View File

@ -63,12 +63,8 @@ node.default['openstack']['telemetry']['conf_secrets'].tap do |conf_secrets|
get_password 'service', 'openstack-telemetry' get_password 'service', 'openstack-telemetry'
end end
identity_public_endpoint = public_endpoint 'identity' identity_endpoint = public_endpoint 'identity'
auth_url = auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['api']['auth']['version']
auth_uri_transform(
identity_public_endpoint.to_s,
node['openstack']['telemetry']['identity-api']['auth']['version']
)
node.default['openstack']['telemetry']['conf'].tap do |conf| node.default['openstack']['telemetry']['conf'].tap do |conf|
conf['api']['host'] = bind_service_address conf['api']['host'] = bind_service_address

View File

@ -34,12 +34,8 @@ node.default['openstack']['telemetry-metric']['conf_secrets'].tap do |conf_secre
get_password 'service', 'openstack-telemetry-metric' get_password 'service', 'openstack-telemetry-metric'
end end
identity_public_endpoint = public_endpoint 'identity' identity_endpoint = public_endpoint 'identity'
auth_url = auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['api']['auth']['version']
auth_uri_transform(
identity_public_endpoint.to_s,
node['openstack']['telemetry-metric']['identity-api']['auth']['version']
)
node.default['openstack']['telemetry-metric']['conf'].tap do |conf| node.default['openstack']['telemetry-metric']['conf'].tap do |conf|
conf['api']['host'] = bind_service_address conf['api']['host'] = bind_service_address

View File

@ -25,9 +25,9 @@ class ::Chef::Recipe
include ::Openstack include ::Openstack
end end
identity_admin_endpoint = admin_endpoint 'identity' identity_endpoint = public_endpoint 'identity'
auth_url = ::URI.decode identity_admin_endpoint.to_s auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['api']['auth']['version']
admin_user = node['openstack']['identity']['admin_user'] 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']

View File

@ -25,7 +25,7 @@ describe 'openstack-telemetry::identity_registration' do
end end
connection_params = { connection_params = {
openstack_auth_url: 'http://127.0.0.1:35357/v3/auth/tokens', openstack_auth_url: 'http://127.0.0.1:5000/v3/auth/tokens',
openstack_username: 'admin', openstack_username: 'admin',
openstack_api_key: 'admin-pass', openstack_api_key: 'admin-pass',
openstack_project_name: 'admin', openstack_project_name: 'admin',

View File

@ -6,16 +6,19 @@ ChefSpec::Coverage.start! { add_filter 'openstack-telemetry' }
require 'chef/application' require 'chef/application'
LOG_LEVEL = :fatal RSpec.configure do |config|
config.color = true
config.formatter = :documentation
config.log_level = :fatal
end
REDHAT_OPTS = { REDHAT_OPTS = {
platform: 'redhat', platform: 'redhat',
version: '7.3', version: '7.4',
log_level: ::LOG_LEVEL,
}.freeze }.freeze
UBUNTU_OPTS = { UBUNTU_OPTS = {
platform: 'ubuntu', platform: 'ubuntu',
version: '16.04', version: '16.04',
log_level: ::LOG_LEVEL,
}.freeze }.freeze
shared_context 'telemetry-stubs' do shared_context 'telemetry-stubs' do