openstack/puppet-ironic
Code Issues Proposed changes

Deprecate auth_uri option

Browse Source 
Option auth_uri from group keystone_authtoken is deprecated[1].
Use option www_authenticate_uri from group keystone_authtoken.

[1]https://review.openstack.org/#/c/508522/

Change-Id: I1cd487e845adc0f53d970bf916385fdaf2c32022
Closes-Bug: #1759098
This commit is contained in:
ZhongShengping 2018-04-05 10:54:06 +08:00
parent 0f3ff5e948
commit 4b6e556d89
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ class Puppet::Provider::Ironic < Puppet::Provider
end
def self.get_ironic_credentials
auth_keys = ['auth_uri', 'project_name', 'username', 'password']
auth_keys = ['www_authenticate_uri', 'project_name', 'username', 'password']
conf = ironic_conf
if conf and conf['keystone_authtoken'] and
auth_keys.all?{|k| !conf['keystone_authtoken'][k].nil?}
@ -67,7 +67,7 @@ correctly configured.")
def self.auth_ironic(*args)
q = ironic_credentials
authenv = {
:OS_AUTH_URL => q['auth_uri'],
:OS_AUTH_URL => q['www_authenticate_uri'],
:OS_USERNAME => q['username'],
:OS_PROJECT_NAME => q['project_name'],
:OS_PASSWORD => q['password'],

14
spec/unit/provider/ironic_spec.rb
View File

@ -11,12 +11,12 @@ describe Puppet::Provider::Ironic do
let :credential_hash do
{
'project_name' => 'admin_tenant',
'username' => 'admin',
'password' => 'password',
'auth_uri' => 'https://192.168.56.210:35357/',
'project_domain_name' => 'admin_tenant_domain',
'user_domain_name' => 'admin_domain',
'project_name' => 'admin_tenant',
'username' => 'admin',
'password' => 'password',
'www_authenticate_uri' => 'https://192.168.56.210:35357/',
'project_domain_name' => 'admin_tenant_domain',
'user_domain_name' => 'admin_domain',
}
end
@ -60,7 +60,7 @@ describe Puppet::Provider::Ironic do
it 'should set auth credentials in the environment' do
authenv = {
:OS_AUTH_URL => credential_hash['auth_uri'],
:OS_AUTH_URL => credential_hash['www_authenticate_uri'],
:OS_USERNAME => credential_hash['username'],
:OS_PROJECT_NAME => credential_hash['project_name'],
:OS_PASSWORD => credential_hash['password'],