From fb2dfdf65efab82c3df684a127d2bc5c68de1e91 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 29 Aug 2021 00:43:06 +0900 Subject: [PATCH] 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 --- lib/puppet/provider/keystone.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/puppet/provider/keystone.rb b/lib/puppet/provider/keystone.rb index 9911b6e5a..c0decc54e 100644 --- a/lib/puppet/provider/keystone.rb +++ b/lib/puppet/provider/keystone.rb @@ -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)