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: Ife7bb6d09eafd137c6858f6ae18d4d34508928a6 Implements: blueprint simplify-identity-endpoint
This commit is contained in:
parent
ad3d1c3c65
commit
3a4c7f6b6f
|
@ -25,7 +25,7 @@ class ::Chef::Recipe
|
|||
include ::Openstack
|
||||
end
|
||||
|
||||
identity_admin_endpoint = admin_endpoint 'identity'
|
||||
identity_endpoint = public_endpoint 'identity'
|
||||
interfaces = {
|
||||
public: { url: public_endpoint('compute-api') },
|
||||
internal: { url: internal_endpoint('compute-api') },
|
||||
|
@ -35,7 +35,7 @@ placement_interfaces = {
|
|||
public: { url: public_endpoint('placement-api') },
|
||||
internal: { url: internal_endpoint('placement-api') },
|
||||
}
|
||||
auth_url = ::URI.decode identity_admin_endpoint.to_s
|
||||
auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['api']['auth']['version']
|
||||
service_pass = get_password 'service', 'openstack-compute'
|
||||
service_user = node['openstack']['compute']['conf']['keystone_authtoken']['username']
|
||||
placement_service_pass = get_password 'service', 'openstack-placement'
|
||||
|
|
|
@ -126,7 +126,7 @@ serial_proxy_endpoint = public_endpoint 'compute-serial-proxy'
|
|||
network_endpoint = internal_endpoint 'network'
|
||||
image_endpoint = internal_endpoint 'image_api'
|
||||
|
||||
Chef::Log.debug("openstack-compute::nova-common:identity_public_endpoint|#{identity_endpoint}")
|
||||
Chef::Log.debug("openstack-compute::nova-common:identity_endpoint|#{identity_endpoint}")
|
||||
Chef::Log.debug("openstack-compute::nova-common:xvpvnc_endpoint|#{xvpvnc_endpoint}")
|
||||
Chef::Log.debug("openstack-compute::nova-common:novnc_endpoint|#{novnc_endpoint}")
|
||||
Chef::Log.debug("openstack-compute::nova-common:compute_api_endpoint|#{::URI.decode compute_api_endpoint.to_s}")
|
||||
|
|
|
@ -11,7 +11,7 @@ describe 'openstack-compute::identity_registration' do
|
|||
include_context 'compute_stubs'
|
||||
|
||||
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_api_key: 'admin',
|
||||
openstack_project_name: 'admin',
|
||||
|
|
|
@ -8,17 +8,19 @@ ChefSpec::Coverage.start! { add_filter 'openstack-compute' }
|
|||
require 'chef/application'
|
||||
require 'securerandom'
|
||||
|
||||
LOG_LEVEL = :fatal
|
||||
RSpec.configure do |config|
|
||||
config.color = true
|
||||
config.formatter = :documentation
|
||||
config.log_level = :fatal
|
||||
end
|
||||
|
||||
REDHAT_OPTS = {
|
||||
platform: 'redhat',
|
||||
version: '7.3',
|
||||
log_level: LOG_LEVEL,
|
||||
version: '7.4',
|
||||
}.freeze
|
||||
UBUNTU_OPTS = {
|
||||
platform: 'ubuntu',
|
||||
version: '16.04',
|
||||
log_level: LOG_LEVEL,
|
||||
file_cache_path: Chef::Config[:file_cache_path],
|
||||
}.freeze
|
||||
|
||||
|
|
Loading…
Reference in New Issue