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, comment out endpoint type until this PR [1] gets merged and released. [1] https://github.com/fog/fog-openstack/pull/494 Depends-On: https://review.opendev.org/666176 Change-Id: I929722b032e37970fe74018e609b76c1682e0db9 Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
parent
d68cadb1a8
commit
5fc3d0635b
|
@ -45,16 +45,17 @@ admin_pass = get_password 'user', 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']
|
||||||
admin_project_domain_name = node['openstack']['identity']['admin_project_domain']
|
admin_project_domain_name = node['openstack']['identity']['admin_project_domain']
|
||||||
|
# TODO(ramereth): commenting this out until
|
||||||
endpoint_type = node['openstack']['identity']['endpoint_type']
|
# https://github.com/fog/fog-openstack/pull/494 gets merged and released.
|
||||||
|
# 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,
|
# openstack_endpoint_type: endpoint_type,
|
||||||
}
|
}
|
||||||
|
|
||||||
%w(user1 user2).each_with_index do |user|
|
%w(user1 user2).each_with_index do |user|
|
||||||
|
@ -152,7 +153,7 @@ node.default['openstack']['integration-test']['conf'].tap do |conf|
|
||||||
conf['compute']['image_ref'] = node['openstack']['integration-test']['image1']['id']
|
conf['compute']['image_ref'] = node['openstack']['integration-test']['image1']['id']
|
||||||
conf['compute']['image_ref_alt'] = node['openstack']['integration-test']['image2']['id']
|
conf['compute']['image_ref_alt'] = node['openstack']['integration-test']['image2']['id']
|
||||||
conf['identity']['uri_v3'] = identity_endpoint.to_s
|
conf['identity']['uri_v3'] = identity_endpoint.to_s
|
||||||
conf['identity']['v3_endpoint_type'] = endpoint_type
|
# conf['identity']['v3_endpoint_type'] = endpoint_type
|
||||||
end
|
end
|
||||||
|
|
||||||
node.default['openstack']['integration-test']['conf_secrets'].tap do |conf_secrets|
|
node.default['openstack']['integration-test']['conf_secrets'].tap do |conf_secrets|
|
||||||
|
|
|
@ -12,12 +12,12 @@ describe 'openstack-integration-test::setup' do
|
||||||
include_context 'tempest-stubs'
|
include_context 'tempest-stubs'
|
||||||
|
|
||||||
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',
|
openstack_api_key: 'admin',
|
||||||
openstack_project_name: 'admin',
|
openstack_project_name: 'admin',
|
||||||
openstack_domain_name: 'default',
|
openstack_domain_name: 'default',
|
||||||
openstack_endpoint_type: 'internalURL',
|
# openstack_endpoint_type: 'internalURL',
|
||||||
}
|
}
|
||||||
|
|
||||||
it 'installs tempest dependencies' do
|
it 'installs tempest dependencies' do
|
||||||
|
@ -174,11 +174,11 @@ describe 'openstack-integration-test::setup' do
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'has an endpoint type matching the default value' do
|
# it 'has an endpoint type matching the default value' do
|
||||||
expect(chef_run).to render_file(file.name).with_content(
|
# expect(chef_run).to render_file(file.name).with_content(
|
||||||
'endpoint_type = internalURL'
|
# 'endpoint_type = internalURL'
|
||||||
)
|
# )
|
||||||
end
|
# end
|
||||||
|
|
||||||
it 'discovers compute hosts' do
|
it 'discovers compute hosts' do
|
||||||
expect(chef_run).to run_execute('discover_hosts')
|
expect(chef_run).to run_execute('discover_hosts')
|
||||||
|
|
Loading…
Reference in New Issue