openstack/puppet-glance
Code Issues Proposed changes

Remove swift_store_config_file

Browse Source 
The parameter was deprecated 5 years ago[1], to encourage users to
use the default file, which can be managed by the glance_swift_config
resource type.

[1] 7f1729e9ae

Change-Id: Ie406089d340d579790357e60defb3f9628823396
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-07-11 14:37:56 +09:00
committed by Tobias Urdin
parent a93781c2d3
commit c7e0af089b
3 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,11 +100,6 @@
#
# DEPRECATED PARAMETERS
#
# [*swift_store_config_file*]
# (Optional) Absolute path to the file containing the swift account(s)
# configuration.
# Defaults to '/etc/glance/glance-swift.conf'
#
# [*swift_store_auth_version*]
# (Optional) The authentication version to be used.
# Defaults to undef
@@ -137,7 +132,6 @@ define glance::backend::multistore::swift(
$store_description = $facts['os_service_default'],
$weight = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$swift_store_config_file = undef,
$swift_store_auth_version = undef,
$swift_store_auth_project_domain_id = undef,
$swift_store_auth_user_domain_id = undef,
@@ -149,13 +143,6 @@ define glance::backend::multistore::swift(
Class['swift::client'] -> Anchor['glance::install::end']
Anchor['swift::service::end'] -> Anchor['glance::service::end']
if $swift_store_config_file != undef {
warning('The swift_store_config_file parameter is deprecated')
$swift_store_config_file_real = $swift_store_config_file
} else {
$swift_store_config_file_real = '/etc/glance/glance-swift.conf'
}
[
'swift_store_auth_version',
'swift_store_auth_project_domain_id',
@@ -174,7 +161,7 @@ define glance::backend::multistore::swift(
"${name}/swift_store_large_object_chunk_size": value => $swift_store_large_object_chunk_size;
"${name}/swift_store_endpoint_type": value => $swift_store_endpoint_type;
"${name}/swift_store_service_type": value => $swift_store_service_type;
"${name}/swift_store_config_file": value => $swift_store_config_file_real;
"${name}/swift_store_config_file": value => '/etc/glance/glance-swift.conf';
"${name}/default_swift_reference": value => $default_swift_reference;
"${name}/swift_buffer_on_upload": value => $swift_buffer_on_upload;
"${name}/swift_upload_buffer_dir": value => $swift_upload_buffer_dir;
@@ -190,7 +177,7 @@ define glance::backend::multistore::swift(
"${name}/swift_store_large_object_chunk_size": value => $swift_store_large_object_chunk_size;
"${name}/swift_store_endpoint_type": value => $swift_store_endpoint_type;
"${name}/swift_store_service_type": value => $swift_store_service_type;
"${name}/swift_store_config_file": value => $swift_store_config_file_real;
"${name}/swift_store_config_file": value => '/etc/glance/glance-swift.conf';
"${name}/default_swift_reference": value => $default_swift_reference;
"${name}/swift_buffer_on_upload": value => $swift_buffer_on_upload;
"${name}/swift_upload_buffer_dir": value => $swift_upload_buffer_dir;

5
releasenotes/notes/remove-swift_store_config_file-39f1c75a7768e37a.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
upgrade:
- |
The ``glance::backend::multistore::swift::swift_store_config_file``
parameter has been removed.

5
spec/defines/glance_backend_multistore_swift_spec.rb
View File

@@ -102,7 +102,6 @@ describe 'glance::backend::multistore::swift' do
:swift_store_endpoint_type => 'publicURL',
:swift_store_service_type => 'object-store',
:swift_store_region => 'RegionTwo',
:swift_store_config_file => '/etc/glance/glance-swift2.conf',
:default_swift_reference => 'swift_creds',
:swift_buffer_on_upload => true,
:swift_upload_buffer_dir => '/var/glance/swift',
@@ -120,7 +119,7 @@ describe 'glance::backend::multistore::swift' do
is_expected.to contain_glance_api_config('swift/swift_store_endpoint_type').with_value('publicURL')
is_expected.to contain_glance_api_config('swift/swift_store_service_type').with_value('object-store')
is_expected.to contain_glance_api_config('swift/swift_store_region').with_value('RegionTwo')
is_expected.to contain_glance_api_config('swift/swift_store_config_file').with_value('/etc/glance/glance-swift2.conf')
is_expected.to contain_glance_api_config('swift/swift_store_config_file').with_value('/etc/glance/glance-swift.conf')
is_expected.to contain_glance_api_config('swift/default_swift_reference').with_value('swift_creds')
is_expected.to contain_glance_api_config('swift/swift_buffer_on_upload').with_value(true)
is_expected.to contain_glance_api_config('swift/swift_upload_buffer_dir').with_value('/var/glance/swift')
@@ -136,7 +135,7 @@ describe 'glance::backend::multistore::swift' do
is_expected.to contain_glance_cache_config('swift/swift_store_endpoint_type').with_value('publicURL')
is_expected.to contain_glance_cache_config('swift/swift_store_service_type').with_value('object-store')
is_expected.to contain_glance_cache_config('swift/swift_store_region').with_value('RegionTwo')
is_expected.to contain_glance_cache_config('swift/swift_store_config_file').with_value('/etc/glance/glance-swift2.conf')
is_expected.to contain_glance_cache_config('swift/swift_store_config_file').with_value('/etc/glance/glance-swift.conf')
is_expected.to contain_glance_cache_config('swift/default_swift_reference').with_value('swift_creds')
is_expected.to contain_glance_cache_config('swift/swift_buffer_on_upload').with_value(true)
is_expected.to contain_glance_cache_config('swift/swift_upload_buffer_dir').with_value('/var/glance/swift')