openstack
/
puppet-keystone
Code Issues Proposed changes

Remove workaround for openstackclient < 4.0.0 

... because openstackclient 4.0.0 was released about 2 years ago and
mixing usage of master puppet-keystone and such old openstackclient is
not supported.

Change-Id: I6a72d632981aadedc5f2aeb0740d6cf8d93c5fef
This commit is contained in:
Takashi Kajinami 2021-08-29 00:43:06 +09:00
parent f2ca5648f0
commit fb2dfdf65e
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/puppet/provider/keystone.rb
View File

@ -244,13 +244,7 @@ class Puppet::Provider::Keystone < Puppet::Provider::Openstack
@credentials.project_domain_name = keystone_puppet_credentials['project_domain_name']
end
raise error unless @credentials.set?
begin
Puppet::Provider::Openstack.request(service, action, properties, @credentials)
rescue Puppet::ExecutionFailure, Puppet::Error::OpenstackUnauthorizedError
# openstackclient < 4.0.0 does not support --os-endpoint and requires --os-url
@credentials.url = auth_endpoint
Puppet::Provider::Openstack.request(service, action, properties, @credentials)
end
Puppet::Provider::Openstack.request(service, action, properties, @credentials)
end
def self.set_domain_for_name(name, domain_name)