Fixes to support fog-openstack-1.x
fog-openstack-1.x already appends "auth/tokens" so we no longer need to do that. In addition, re-add openstack_endpoint_type which is now fixed now that this [1] has been released upstream. [1] https://github.com/fog/fog-openstack/pull/494 Change-Id: I06ee3681ff8bc90f15b2b0ecbdcaebe475709b31 Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
parent
e0a39ccaf1
commit
fd3d9ceb62
|
@ -33,12 +33,14 @@ 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']
|
||||||
service_domain_name = node['openstack']['telemetry']['conf']['keystone_authtoken']['user_domain_name']
|
service_domain_name = node['openstack']['telemetry']['conf']['keystone_authtoken']['user_domain_name']
|
||||||
|
endpoint_type = node['openstack']['identity']['endpoint_type']
|
||||||
connection_params = {
|
connection_params = {
|
||||||
openstack_auth_url: "#{auth_url}/auth/tokens",
|
openstack_auth_url: auth_url,
|
||||||
openstack_username: admin_user,
|
openstack_username: admin_user,
|
||||||
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,
|
||||||
}
|
}
|
||||||
|
|
||||||
%w(telemetry telemetry_metric aodh).each do |telemetry_service|
|
%w(telemetry telemetry_metric aodh).each do |telemetry_service|
|
||||||
|
|
|
@ -25,11 +25,12 @@ describe 'openstack-telemetry::identity_registration' do
|
||||||
end
|
end
|
||||||
|
|
||||||
connection_params = {
|
connection_params = {
|
||||||
openstack_auth_url: 'http://127.0.0.1:5000/v3/auth/tokens',
|
openstack_auth_url: 'http://127.0.0.1:5000/v3',
|
||||||
openstack_username: 'admin',
|
openstack_username: 'admin',
|
||||||
openstack_api_key: 'admin-pass',
|
openstack_api_key: 'admin-pass',
|
||||||
openstack_project_name: 'admin',
|
openstack_project_name: 'admin',
|
||||||
openstack_domain_name: 'default',
|
openstack_domain_name: 'default',
|
||||||
|
openstack_endpoint_type: 'internalURL',
|
||||||
}
|
}
|
||||||
service_user = service_name
|
service_user = service_name
|
||||||
url = "http://127.0.0.1:#{port}"
|
url = "http://127.0.0.1:#{port}"
|
||||||
|
|
Loading…
Reference in New Issue