openstack/puppet-mistral
Code Issues Proposed changes

Make providers use auth_url for authentication

Browse Source 
When reading credentials from the configuration's keystone_authtoken
section auth_uri was used as URL for Keystone.
As auth_uri is a public endpoint that is not necessarily reachable for
the Puppet agent, this change uses the more appropriate auth_url as
Keystone URL.

Change-Id: Ia5bcfaf9611340a3b01b69b678d7c541b62d5ca2
This commit is contained in:
Matthias Bastian 2018-08-03 12:09:55 +02:00
parent 7dd767e0e4
commit 8e79ad2e07
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/puppet/provider/mistral.rb
View File

@ -57,7 +57,7 @@ class Puppet::Provider::Mistral < Puppet::Provider::MistralWorkflowRequester
end
def self.get_mistral_credentials
auth_keys = ['auth_uri', 'admin_tenant_name', 'admin_user',
auth_keys = ['auth_url', 'admin_tenant_name', 'admin_user',
'admin_password']
conf = mistral_conf
if conf and conf['keystone_authtoken'] and
@ -91,7 +91,7 @@ class Puppet::Provider::Mistral < Puppet::Provider::MistralWorkflowRequester
def self.get_auth_endpoint
m = mistral_credentials
"#{m['auth_uri']}"
"#{m['auth_url']}"
end
def self.auth_endpoint