openstack
/
puppet-cinder
Code Issues Proposed changes

Read os_region_name from cinder.conf when doing requests with the Openstack client 

Closes-bug: 1720824
Change-Id: I7334d16ba11594085f88c80e9daf2358d841fa17
This commit is contained in:
Saverio Proto 2017-10-02 18:03:27 +02:00
parent d260b6faeb
commit 74c8acbcb3
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,9 @@ class Puppet::Provider::Cinder < Puppet::Provider::Openstack
@credentials.password = cinder_credentials['password']
@credentials.project_name = cinder_credentials['project_name']
@credentials.auth_url = auth_endpoint
if cinder_credentials['region_name']
@credentials.region_name = cinder_credentials['region_name']
end
if @credentials.version == '3'
@credentials.user_domain_name = cinder_credentials['user_domain_name']
@credentials.project_domain_name = cinder_credentials['project_domain_name']
@ -66,6 +69,9 @@ class Puppet::Provider::Cinder < Puppet::Provider::Openstack
else
creds['user_domain_name'] = 'Default'
end
if conf['DEFAULT'] and conf['DEFAULT']['os_region_name']
creds['region_name'] = conf['DEFAULT']['os_region_name']
end
return creds
else
raise(Puppet::Error, "File: #{conf_filename} does not contain all " +