Make auth_uri attribute for ec2authtoken section
Make auth_uri attribute for ec2authtoken section Closes-Bug: #1480818 Change-Id: I6b3018317e6c4890d193aee6f6b5e101d901e687
This commit is contained in:
parent
47a8f33d4e
commit
0170665c67
|
@ -50,6 +50,7 @@ default['openstack']['orchestration']['service_tenant_name'] = 'service'
|
||||||
default['openstack']['orchestration']['service_user'] = 'heat'
|
default['openstack']['orchestration']['service_user'] = 'heat'
|
||||||
default['openstack']['orchestration']['service_role'] = 'service'
|
default['openstack']['orchestration']['service_role'] = 'service'
|
||||||
|
|
||||||
|
default['openstack']['orchestration']['ec2authtoken']['auth']['version'] = 'v2.0'
|
||||||
default['openstack']['orchestration']['api']['auth']['version'] = node['openstack']['api']['auth']['version']
|
default['openstack']['orchestration']['api']['auth']['version'] = node['openstack']['api']['auth']['version']
|
||||||
|
|
||||||
# A PEM encoded Certificate Authority to use for clients when verifying HTTPs connections.
|
# A PEM encoded Certificate Authority to use for clients when verifying HTTPs connections.
|
||||||
|
|
|
@ -70,6 +70,7 @@ if node['openstack']['orchestration']['stack_domain_admin']
|
||||||
stack_domain_admin_password = get_password 'user', node['openstack']['orchestration']['stack_domain_admin']
|
stack_domain_admin_password = get_password 'user', node['openstack']['orchestration']['stack_domain_admin']
|
||||||
end
|
end
|
||||||
|
|
||||||
|
ec2_auth_uri = auth_uri_transform identity_endpoint.to_s, node['openstack']['orchestration']['ec2authtoken']['auth']['version']
|
||||||
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)
|
identity_uri = identity_uri_transform(identity_admin_endpoint)
|
||||||
|
|
||||||
|
@ -114,6 +115,7 @@ template '/etc/heat/heat.conf' do
|
||||||
mq_service_type: mq_service_type,
|
mq_service_type: mq_service_type,
|
||||||
mq_password: mq_password,
|
mq_password: mq_password,
|
||||||
rabbit_hosts: rabbit_hosts,
|
rabbit_hosts: rabbit_hosts,
|
||||||
|
ec2_auth_uri: ec2_auth_uri,
|
||||||
auth_uri: auth_uri,
|
auth_uri: auth_uri,
|
||||||
identity_uri: identity_uri,
|
identity_uri: identity_uri,
|
||||||
service_pass: service_pass,
|
service_pass: service_pass,
|
||||||
|
|
|
@ -406,6 +406,12 @@ shared_examples 'expects to create heat conf' do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'has ec2authtoken values' do
|
||||||
|
it 'has default ec2authtoken values' do
|
||||||
|
expect(chef_run).to render_config_file(file.name).with_section_content('ec2authtoken', %r{^auth_uri=http://127.0.0.1:5000/v2.0$})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe 'has rabbit values' do
|
describe 'has rabbit values' do
|
||||||
before do
|
before do
|
||||||
node.set['openstack']['mq']['orchestration']['service_type'] = 'rabbitmq'
|
node.set['openstack']['mq']['orchestration']['service_type'] = 'rabbitmq'
|
||||||
|
|
|
@ -964,7 +964,7 @@ sql_connection=<%= @sql_connection %>
|
||||||
#
|
#
|
||||||
|
|
||||||
# Authentication Endpoint URI. (string value)
|
# Authentication Endpoint URI. (string value)
|
||||||
#auth_uri=<None>
|
auth_uri=<%= @ec2_auth_uri %>
|
||||||
|
|
||||||
# Allow orchestration of multiple clouds. (boolean value)
|
# Allow orchestration of multiple clouds. (boolean value)
|
||||||
#multi_cloud=false
|
#multi_cloud=false
|
||||||
|
|
Loading…
Reference in New Issue