openstack/puppet-openstack_extras
Code Issues Proposed changes

Restore OS_IDENTITY_API_VERSION=3 by default

Browse Source 
Not having OS_IDENTITY_API_VERSION breaks completely Debian. Revert to
the previous default.

Change-Id: Iac78c461859680ce8d641b9f6dc43e634be57c05
This commit is contained in:
Thomas Goirand 2018-05-09 13:07:36 +02:00
parent eb8750b7b5
commit 2a127fed38
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/auth_file.pp
View File

@ -111,7 +111,7 @@
# #
# [*identity_api_version*] # [*identity_api_version*]
# (optional) Identity API version to use. # (optional) Identity API version to use.
# Defaults to undef. # Defaults to '3'.
# #
# [*object_api_version*] # [*object_api_version*]
# (optional) Object API version to use. # (optional) Object API version to use.
@ -144,7 +144,7 @@ class openstack_extras::auth_file(
$network_api_version = undef, $network_api_version = undef,
$image_api_version = undef, $image_api_version = undef,
$volume_api_version = undef, $volume_api_version = undef,
$identity_api_version = undef, $identity_api_version = '3',
$object_api_version = undef, $object_api_version = undef,
) { ) {

5
spec/classes/openstack_extras_auth_file_spec.rb
View File

@ -26,6 +26,7 @@ describe 'openstack_extras::auth_file' do
'export KEYSTONE_ENDPOINT_TYPE=\'publicURL\'', 'export KEYSTONE_ENDPOINT_TYPE=\'publicURL\'',
'export NOVA_ENDPOINT_TYPE=\'publicURL\'', 'export NOVA_ENDPOINT_TYPE=\'publicURL\'',
'export NEUTRON_ENDPOINT_TYPE=\'publicURL\'', 'export NEUTRON_ENDPOINT_TYPE=\'publicURL\'',
'export OS_IDENTITY_API_VERSION=\'3\'',
]) ])
end end
end end
@ -57,7 +58,7 @@ describe 'openstack_extras::auth_file' do
:network_api_version => '2.0', :network_api_version => '2.0',
:image_api_version => '2', :image_api_version => '2',
:volume_api_version => '2', :volume_api_version => '2',
:identity_api_version => '3', :identity_api_version => '3.1',
:object_api_version => '1', :object_api_version => '1',
} }
end end
@ -87,7 +88,7 @@ describe 'openstack_extras::auth_file' do
'export OS_NETWORK_API_VERSION=\'2.0\'', 'export OS_NETWORK_API_VERSION=\'2.0\'',
'export OS_IMAGE_API_VERSION=\'2\'', 'export OS_IMAGE_API_VERSION=\'2\'',
'export OS_VOLUME_API_VERSION=\'2\'', 'export OS_VOLUME_API_VERSION=\'2\'',
'export OS_IDENTITY_API_VERSION=\'3\'', 'export OS_IDENTITY_API_VERSION=\'3.1\'',
'export OS_OBJECT_API_VERSION=\'1\'', 'export OS_OBJECT_API_VERSION=\'1\'',
]) ])
end end