diff --git a/lib/puppet/provider/cinder.rb b/lib/puppet/provider/cinder.rb index 924e8d75..7d88aded 100644 --- a/lib/puppet/provider/cinder.rb +++ b/lib/puppet/provider/cinder.rb @@ -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 " +