openstack
/
puppet-keystone
Code Issues Proposed changes

Merge "Remove workaround for openstackclient < 4.0.0"

This commit is contained in:
Zuul 2021-09-21 07:34:15 +00:00 committed by Gerrit Code Review
parent ece5ca3b43 fb2dfdf65e
commit 03a618171e
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

@ -247,13 +247,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)