diff --git a/manifests/backend/multistore/swift.pp b/manifests/backend/multistore/swift.pp index 920e4f4d..6553011a 100644 --- a/manifests/backend/multistore/swift.pp +++ b/manifests/backend/multistore/swift.pp @@ -39,7 +39,7 @@ # Optional. Default: $::os_service_default. # # [*swift_store_auth_version*] -# Optional. Default: '2' +# Optional. Default: '3' # # [*swift_store_large_object_size*] # Optional. What size, in MB, should Glance start chunking image files @@ -94,7 +94,7 @@ define glance::backend::multistore::swift( $swift_store_key, $swift_store_auth_address = 'http://127.0.0.1:5000/v3/', $swift_store_container = $::os_service_default, - $swift_store_auth_version = '2', + $swift_store_auth_version = '3', $swift_store_auth_project_domain_id = 'default', $swift_store_auth_user_domain_id = 'default', $swift_store_large_object_size = $::os_service_default, diff --git a/manifests/backend/swift.pp b/manifests/backend/swift.pp index c4641aa8..5064ed74 100644 --- a/manifests/backend/swift.pp +++ b/manifests/backend/swift.pp @@ -24,7 +24,7 @@ # Optional. Default: $::os_service_default. # # [*swift_store_auth_version*] -# Optional. Default: '2' +# Optional. Default: '3' # # [*swift_store_large_object_size*] # Optional. What size, in MB, should Glance start chunking image files @@ -61,7 +61,7 @@ class glance::backend::swift( $swift_store_key, $swift_store_auth_address = 'http://127.0.0.1:5000/v3/', $swift_store_container = $::os_service_default, - $swift_store_auth_version = '2', + $swift_store_auth_version = '3', $swift_store_auth_project_domain_id = 'default', $swift_store_auth_user_domain_id = 'default', $swift_store_large_object_size = $::os_service_default, diff --git a/releasenotes/notes/bug-1947816-75538e8fd13e59c6.yaml b/releasenotes/notes/bug-1947816-75538e8fd13e59c6.yaml new file mode 100644 index 00000000..c22a3a35 --- /dev/null +++ b/releasenotes/notes/bug-1947816-75538e8fd13e59c6.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + `Bug #1947816 `_: + Fix the default auth_version for swift backend so that Keystone v3 API is + used by default instead of v2 API. diff --git a/spec/classes/glance_backend_swift_spec.rb b/spec/classes/glance_backend_swift_spec.rb index 989f64ea..b1a079ed 100644 --- a/spec/classes/glance_backend_swift_spec.rb +++ b/spec/classes/glance_backend_swift_spec.rb @@ -30,7 +30,7 @@ describe 'glance::backend::swift' do is_expected.to contain_glance_api_config('glance_store/default_swift_reference').with_value('ref1') is_expected.to contain_glance_swift_config('ref1/key').with_value('key') is_expected.to contain_glance_swift_config('ref1/user').with_value('user') - is_expected.to contain_glance_swift_config('ref1/auth_version').with_value('2') + is_expected.to contain_glance_swift_config('ref1/auth_version').with_value('3') is_expected.to contain_glance_swift_config('ref1/auth_address').with_value('http://127.0.0.1:5000/v3/') is_expected.to contain_glance_swift_config('ref1/user_domain_id').with_value('default') is_expected.to contain_glance_swift_config('ref1/project_domain_id').with_value('default') diff --git a/spec/defines/glance_backend_multistore_swift_spec.rb b/spec/defines/glance_backend_multistore_swift_spec.rb index ce05ab2c..c1b3a41f 100644 --- a/spec/defines/glance_backend_multistore_swift_spec.rb +++ b/spec/defines/glance_backend_multistore_swift_spec.rb @@ -53,7 +53,7 @@ describe 'glance::backend::multistore::swift' do is_expected.to contain_glance_api_config('swift/swift_upload_buffer_dir').with_value('') is_expected.to contain_glance_swift_config('ref1/key').with_value('key').with_secret(true) is_expected.to contain_glance_swift_config('ref1/user').with_value('user') - is_expected.to contain_glance_swift_config('ref1/auth_version').with_value('2') + is_expected.to contain_glance_swift_config('ref1/auth_version').with_value('3') is_expected.to contain_glance_swift_config('ref1/auth_address').with_value('http://127.0.0.1:5000/v3/') is_expected.to contain_glance_swift_config('ref1/user_domain_id').with_value('default') is_expected.to contain_glance_swift_config('ref1/project_domain_id').with_value('default')