openstack
/
puppet-openstacklib
Code Issues Proposed changes

Added openstack/OSC option os-identity-api-version 

- Default to version 3

Change-Id: I53f6bdec003ca0ee770a9b91fc2a83eb30480efe
This commit is contained in:
Gilles Dubreuil 2015-04-15 22:11:35 +10:00 committed by Emilien Macchi
parent b7657a4bd3
commit 54f3a0be5c
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/puppet/provider/openstack.rb
View File

@ -149,8 +149,13 @@ class Puppet::Provider::Openstack < Puppet::Provider
end
def self.token_auth_args(credentials)
[ '--os-token', credentials['token'],
'--os-url', credentials['url'] ]
args = [ '--os-token', credentials['token'],
'--os-url', credentials['url'] ]
# Add the api version only if requested by the caller
if credentials['version']
args << [ '--os-identity-api-version', credentials['version'] ]
end
args
end
def token_auth_args(credentials)

9
spec/unit/provider/openstack_spec.rb
View File

@ -136,8 +136,9 @@ describe Puppet::Provider::Openstack do
{
:name => 'stubresource',
:auth => {
'token' => 'secrettoken',
'url' => 'http://127.0.0.1:5000/v2.0'
'token' => 'secrettoken',
'url' => 'http://127.0.0.1:5000/v3',
'version' => '3'
}
}
end
@ -147,7 +148,7 @@ describe Puppet::Provider::Openstack do
it 'makes a successful request' do
provider.class.stubs(:openstack)
.with('project', 'list', '--quiet', '--format', 'csv', [['--long', '--os-token', 'secrettoken', '--os-url', 'http://127.0.0.1:5000/v2.0']])
.with('project', 'list', '--quiet', '--format', 'csv', [['--long', '--os-token', 'secrettoken', '--os-url', 'http://127.0.0.1:5000/v3', '--os-identity-api-version', '3']])
.returns('"ID","Name","Description","Enabled"
"1cb05cfed7c24279be884ba4f6520262","test","Test tenant",True
')
@ -157,7 +158,7 @@ describe Puppet::Provider::Openstack do
it 'makes a successful show request' do
provider.class.stubs(:openstack)
.with('project', 'show', '--format', 'shell', [['test', '--os-token', 'secrettoken', '--os-url', 'http://127.0.0.1:5000/v2.0']])
.with('project', 'show', '--format', 'shell', [['test', '--os-token', 'secrettoken', '--os-url', 'http://127.0.0.1:5000/v3', '--os-identity-api-version', '3']])
.returns('ID="1cb05cfed7c24279be884ba4f6520262"
Name="test"
Description="Test Tenant"