openstack/puppet-tempest
Code Issues Proposed changes

Enable Keystone v3 support for providers

Browse Source 
tempest_glance_id_setter and tempest_neutron_net_id_setter were
previously using Credentialsv2_0, which do not work in a Keystone v3
environment (and that's what we should be using today).

Closes-Bug: #1633864

Change-Id: I95ea682064ff6365622fc31c562b42014fc52303
This commit is contained in:
Javier Pena 2016-10-17 13:26:15 +02:00
parent 3ab06c2b3b
commit 74424c4a4b
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/puppet/provider/tempest.rb
View File

@ -27,6 +27,11 @@ class Puppet::Provider::Tempest < Puppet::Provider::Openstack
@credentials.password = tempest_credentials['admin_password'] @credentials.password = tempest_credentials['admin_password']
@credentials.project_name = tempest_credentials['admin_project_name'] @credentials.project_name = tempest_credentials['admin_project_name']
@credentials.auth_url = tempest_credentials['auth_endpoint'] @credentials.auth_url = tempest_credentials['auth_endpoint']
if @credentials.version == '3'
@credentials.user_domain_name = tempest_credentials['admin_domain_name']
@credentials.project_domain_name = tempest_credentials['admin_domain_name']
@credentials.auth_url = tempest_credentials['auth_endpoint_v3']
end
raise error unless @credentials.set? raise error unless @credentials.set?
Puppet::Provider::Openstack.request(service, action, properties, @credentials) Puppet::Provider::Openstack.request(service, action, properties, @credentials)
end end
@ -37,6 +42,8 @@ class Puppet::Provider::Tempest < Puppet::Provider::Openstack
t['admin_password'] = tempest_file['auth']['admin_password'] t['admin_password'] = tempest_file['auth']['admin_password']
t['admin_project_name'] = tempest_file['auth']['admin_project_name'] t['admin_project_name'] = tempest_file['auth']['admin_project_name']
t['auth_endpoint'] = tempest_file['identity']['uri'] t['auth_endpoint'] = tempest_file['identity']['uri']
t['auth_endpoint_v3'] = tempest_file['identity']['uri_v3']
t['admin_domain_name'] = tempest_file['auth']['admin_domain_name']
return t return t
end end

2
lib/puppet/provider/tempest_glance_id_setter/openstack.rb
View File

@ -5,7 +5,7 @@ Puppet::Type.type(:tempest_glance_id_setter).provide(
:parent => Puppet::Provider::Tempest :parent => Puppet::Provider::Tempest
) do ) do
@credentials = Puppet::Provider::Openstack::CredentialsV2_0.new @credentials = Puppet::Provider::Openstack::CredentialsV3.new
def exists? def exists?
lines.find do |line| lines.find do |line|

2
lib/puppet/provider/tempest_neutron_net_id_setter/openstack.rb
View File

@ -5,7 +5,7 @@ Puppet::Type.type(:tempest_neutron_net_id_setter).provide(
:parent => Puppet::Provider::Tempest :parent => Puppet::Provider::Tempest
) do ) do
@credentials = Puppet::Provider::Openstack::CredentialsV2_0.new @credentials = Puppet::Provider::Openstack::CredentialsV3.new
def exists? def exists?
lines.find do |line| lines.find do |line|