Use identity_uri_transform for identiry_uri support
Remove deprecated keys and use identity_uri via the new transform helper method. Change-Id: I988a902d42942109047bcc69d4b02ec4ba66ae41 Implements: blueprint identity-uri
This commit is contained in:
parent
01e030abaa
commit
32fdf00cf1
|
@ -70,6 +70,7 @@ if node['openstack']['orchestration']['stack_domain_admin']
|
||||||
end
|
end
|
||||||
|
|
||||||
auth_uri = auth_uri_transform identity_endpoint.to_s, node['openstack']['orchestration']['api']['auth']['version']
|
auth_uri = auth_uri_transform identity_endpoint.to_s, node['openstack']['orchestration']['api']['auth']['version']
|
||||||
|
identity_uri = identity_uri_transform(identity_admin_endpoint)
|
||||||
|
|
||||||
mq_service_type = node['openstack']['mq']['orchestration']['service_type']
|
mq_service_type = node['openstack']['mq']['orchestration']['service_type']
|
||||||
|
|
||||||
|
@ -113,7 +114,7 @@ template '/etc/heat/heat.conf' do
|
||||||
mq_password: mq_password,
|
mq_password: mq_password,
|
||||||
rabbit_hosts: rabbit_hosts,
|
rabbit_hosts: rabbit_hosts,
|
||||||
auth_uri: auth_uri,
|
auth_uri: auth_uri,
|
||||||
identity_admin_endpoint: identity_admin_endpoint,
|
identity_uri: identity_uri,
|
||||||
service_pass: service_pass,
|
service_pass: service_pass,
|
||||||
sql_connection: sql_connection,
|
sql_connection: sql_connection,
|
||||||
heat_api_bind: heat_api_bind,
|
heat_api_bind: heat_api_bind,
|
||||||
|
|
|
@ -303,10 +303,8 @@ shared_examples 'expects to create heat conf' do
|
||||||
/^rabbit_virtual_host=\/$/,
|
/^rabbit_virtual_host=\/$/,
|
||||||
/^bind_host=127.0.0.1$/,
|
/^bind_host=127.0.0.1$/,
|
||||||
/^bind_port=8004$/,
|
/^bind_port=8004$/,
|
||||||
/^auth_host=127.0.0.1$/,
|
|
||||||
/^auth_port=35357$/,
|
|
||||||
/^auth_protocol=http$/,
|
|
||||||
%r{^auth_uri=http://127.0.0.1:5000/v2.0$},
|
%r{^auth_uri=http://127.0.0.1:5000/v2.0$},
|
||||||
|
%r{^identity_uri=http://127.0.0.1:35357/$},
|
||||||
/^auth_version=v2.0$/,
|
/^auth_version=v2.0$/,
|
||||||
/^hash_algorithms=md5$/,
|
/^hash_algorithms=md5$/,
|
||||||
/^insecure=false$/,
|
/^insecure=false$/,
|
||||||
|
|
|
@ -1219,29 +1219,13 @@ bind_port=<%= @heat_api_cloudwatch_bind.port %>
|
||||||
# Options defined in keystoneclient.middleware.auth_token
|
# Options defined in keystoneclient.middleware.auth_token
|
||||||
#
|
#
|
||||||
|
|
||||||
# Prefix to prepend at the beginning of the path. Deprecated,
|
|
||||||
# use identity_uri. (string value)
|
|
||||||
#auth_admin_prefix=
|
|
||||||
|
|
||||||
# Host providing the admin Identity API endpoint. Deprecated,
|
|
||||||
# use identity_uri. (string value)
|
|
||||||
auth_host=<%= @identity_admin_endpoint.host %>
|
|
||||||
|
|
||||||
# Port of the admin Identity API endpoint. Deprecated, use
|
|
||||||
# identity_uri. (integer value)
|
|
||||||
auth_port=<%= @identity_admin_endpoint.port %>
|
|
||||||
|
|
||||||
# Protocol of the admin Identity API endpoint (http or https).
|
|
||||||
# Deprecated, use identity_uri. (string value)
|
|
||||||
auth_protocol=<%= @identity_admin_endpoint.scheme %>
|
|
||||||
|
|
||||||
# Complete public Identity API endpoint (string value)
|
# Complete public Identity API endpoint (string value)
|
||||||
auth_uri=<%= @auth_uri %>
|
auth_uri=<%= @auth_uri %>
|
||||||
|
|
||||||
# Complete admin Identity API endpoint. This should specify
|
# Complete admin Identity API endpoint. This should specify
|
||||||
# the unversioned root endpoint e.g. https://localhost:35357/
|
# the unversioned root endpoint e.g. https://localhost:35357/
|
||||||
# (string value)
|
# (string value)
|
||||||
#identity_uri=<None>
|
identity_uri=<%= @identity_uri %>
|
||||||
|
|
||||||
# API version of the admin Identity API endpoint (string
|
# API version of the admin Identity API endpoint (string
|
||||||
# value)
|
# value)
|
||||||
|
|
Loading…
Reference in New Issue