From 2a127fed38064d9ce6a0b9fe4285a99cfd167cb5 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 9 May 2018 13:07:36 +0200 Subject: [PATCH] Restore OS_IDENTITY_API_VERSION=3 by default Not having OS_IDENTITY_API_VERSION breaks completely Debian. Revert to the previous default. Change-Id: Iac78c461859680ce8d641b9f6dc43e634be57c05 --- manifests/auth_file.pp | 4 ++-- spec/classes/openstack_extras_auth_file_spec.rb | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/manifests/auth_file.pp b/manifests/auth_file.pp index c3f9e86..14dfd5c 100644 --- a/manifests/auth_file.pp +++ b/manifests/auth_file.pp @@ -111,7 +111,7 @@ # # [*identity_api_version*] # (optional) Identity API version to use. -# Defaults to undef. +# Defaults to '3'. # # [*object_api_version*] # (optional) Object API version to use. @@ -144,7 +144,7 @@ class openstack_extras::auth_file( $network_api_version = undef, $image_api_version = undef, $volume_api_version = undef, - $identity_api_version = undef, + $identity_api_version = '3', $object_api_version = undef, ) { diff --git a/spec/classes/openstack_extras_auth_file_spec.rb b/spec/classes/openstack_extras_auth_file_spec.rb index 3c0c074..8a8d96f 100644 --- a/spec/classes/openstack_extras_auth_file_spec.rb +++ b/spec/classes/openstack_extras_auth_file_spec.rb @@ -26,6 +26,7 @@ describe 'openstack_extras::auth_file' do 'export KEYSTONE_ENDPOINT_TYPE=\'publicURL\'', 'export NOVA_ENDPOINT_TYPE=\'publicURL\'', 'export NEUTRON_ENDPOINT_TYPE=\'publicURL\'', + 'export OS_IDENTITY_API_VERSION=\'3\'', ]) end end @@ -57,7 +58,7 @@ describe 'openstack_extras::auth_file' do :network_api_version => '2.0', :image_api_version => '2', :volume_api_version => '2', - :identity_api_version => '3', + :identity_api_version => '3.1', :object_api_version => '1', } end @@ -87,7 +88,7 @@ describe 'openstack_extras::auth_file' do 'export OS_NETWORK_API_VERSION=\'2.0\'', 'export OS_IMAGE_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\'', ]) end