Refer keystone_authtoken instead of neutron to detect region
... because we generally use parameters under keystone_authtoken to find credentials. This patch also removes useless and incorrect handling about keystone version, so that domain parameters are correctly set. Change-Id: Ibfd489e977e8f8f52defecacc00cb8afcd1596a1
This commit is contained in:
parent
c8786c63ea
commit
bccf7a3959
|
@ -27,10 +27,8 @@ class Puppet::Provider::Nova < Puppet::Provider::Openstack
|
||||||
@credentials.password = nova_credentials['password']
|
@credentials.password = nova_credentials['password']
|
||||||
@credentials.project_name = nova_credentials['project_name']
|
@credentials.project_name = nova_credentials['project_name']
|
||||||
@credentials.auth_url = auth_endpoint
|
@credentials.auth_url = auth_endpoint
|
||||||
if @credentials.version == '3'
|
@credentials.user_domain_name = nova_credentials['user_domain_name']
|
||||||
@credentials.user_domain_name = nova_credentials['user_domain_name']
|
@credentials.project_domain_name = nova_credentials['project_domain_name']
|
||||||
@credentials.project_domain_name = nova_credentials['project_domain_name']
|
|
||||||
end
|
|
||||||
if nova_credentials['region_name']
|
if nova_credentials['region_name']
|
||||||
@credentials.region_name = nova_credentials['region_name']
|
@credentials.region_name = nova_credentials['region_name']
|
||||||
end
|
end
|
||||||
|
@ -88,19 +86,22 @@ class Puppet::Provider::Nova < 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['neutron'] and conf['neutron']['region_name']
|
if !conf['keystone_authtoken']['region_name'].nil?
|
||||||
creds['region_name'] = conf['neutron']['region_name'].strip
|
creds['region_name'] = conf['keystone_authtoken']['region_name'].strip
|
||||||
end
|
end
|
||||||
|
|
||||||
if !conf['keystone_authtoken']['project_domain_name'].nil?
|
if !conf['keystone_authtoken']['project_domain_name'].nil?
|
||||||
creds['project_domain_name'] = conf['keystone_authtoken']['project_domain_name'].strip
|
creds['project_domain_name'] = conf['keystone_authtoken']['project_domain_name'].strip
|
||||||
else
|
else
|
||||||
creds['project_domain_name'] = 'Default'
|
creds['project_domain_name'] = 'Default'
|
||||||
end
|
end
|
||||||
|
|
||||||
if !conf['keystone_authtoken']['user_domain_name'].nil?
|
if !conf['keystone_authtoken']['user_domain_name'].nil?
|
||||||
creds['user_domain_name'] = conf['keystone_authtoken']['user_domain_name'].strip
|
creds['user_domain_name'] = conf['keystone_authtoken']['user_domain_name'].strip
|
||||||
else
|
else
|
||||||
creds['user_domain_name'] = 'Default'
|
creds['user_domain_name'] = 'Default'
|
||||||
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 " +
|
||||||
|
|
Loading…
Reference in New Issue