openstack/puppet-cinder
Code Issues Proposed changes

Refer keystone_authtoken to find credentials

Browse Source 
... because api/os_region_name is not set since [1].
This patch also fixes incorrect lookup about domain parameters.

This patch also removes useless and incorrect handling about keystone
version, so that domain parameters are correctly set.

[1] c2d618cae7

Change-Id: Idaa1c767e8cab645567b920dc9d377abf509ec54
This commit is contained in:
Takashi Kajinami
2020-04-14 20:09:23 +09:00
parent 3b612bba47
commit 29e221fe55
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/puppet/provider/cinder.rb
View File

@@ -34,13 +34,11 @@ class Puppet::Provider::Cinder < Puppet::Provider::Openstack
@credentials.password = cinder_credentials['password'] @credentials.password = cinder_credentials['password']
@credentials.project_name = cinder_credentials['project_name'] @credentials.project_name = cinder_credentials['project_name']
@credentials.auth_url = auth_endpoint @credentials.auth_url = auth_endpoint
@credentials.user_domain_name = cinder_credentials['user_domain_name']
@credentials.project_domain_name = cinder_credentials['project_domain_name']
if cinder_credentials['region_name'] if cinder_credentials['region_name']
@credentials.region_name = cinder_credentials['region_name'] @credentials.region_name = cinder_credentials['region_name']
end end
if @credentials.version == '3'
@credentials.user_domain_name = cinder_credentials['user_domain_name']
@credentials.project_domain_name = cinder_credentials['project_domain_name']
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
@@ -61,19 +59,22 @@ class Puppet::Provider::Cinder < Puppet::Provider::Openstack
auth_keys.all?{|k| !conf['keystone_authtoken'][k].nil?} auth_keys.all?{|k| !conf['keystone_authtoken'][k].nil?}
creds = Hash[ auth_keys.map \ creds = Hash[ auth_keys.map \
{ |k| [k, conf['keystone_authtoken'][k].strip] } ] { |k| [k, conf['keystone_authtoken'][k].strip] } ]
if conf['project_domain_name'] if conf['keystone_authtoken']['project_domain_name']
creds['project_domain_name'] = conf['project_domain_name'] creds['project_domain_name'] = conf['keystone_authtoken']['project_domain_name']
else else
creds['project_domain_name'] = 'Default' creds['project_domain_name'] = 'Default'
end end
if conf['user_domain_name']
creds['user_domain_name'] = conf['user_domain_name'] if conf['keystone_authtoken']['user_domain_name']
creds['user_domain_name'] = conf['keystone_authtoken']['user_domain_name']
else else
creds['user_domain_name'] = 'Default' creds['user_domain_name'] = 'Default'
end end
if conf['DEFAULT'] and conf['DEFAULT']['os_region_name']
creds['region_name'] = conf['DEFAULT']['os_region_name'] if conf['keystone_authtoken']['region_name']
creds['region_name'] = conf['keystone_authtoken']['region_name']
end end
return creds return creds
else else
raise(Puppet::Error, "File: #{conf_filename} does not contain all " + raise(Puppet::Error, "File: #{conf_filename} does not contain all " +