openstack
/
puppet-glance
Code Issues Proposed changes

Swift backend: Use Keystone v3 API by default 

... because v2 API was removed a long ago and is no longer available.

Closes-Bug: #1947816
Change-Id: I1402f72fa58f617ccb1e92caa774ca15a6133c58
This commit is contained in:
Takashi Kajinami 2021-10-20 12:09:50 +09:00
parent 53b75099d0
commit 8a70cf5dea
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/backend/multistore/swift.pp
View File

@ -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,

4
manifests/backend/swift.pp
View File

@ -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,

6
releasenotes/notes/bug-1947816-75538e8fd13e59c6.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
`Bug #1947816 <https://bugs.launchpad.net/puppet-glance/+bug/1947816>`_:
Fix the default auth_version for swift backend so that Keystone v3 API is
used by default instead of v2 API.

2
spec/classes/glance_backend_swift_spec.rb
View File

@ -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')

2
spec/defines/glance_backend_multistore_swift_spec.rb
View File

@ -53,7 +53,7 @@ describe 'glance::backend::multistore::swift' do
is_expected.to contain_glance_api_config('swift/swift_upload_buffer_dir').with_value('<SERVICE DEFAULT>')
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')