openstack
/
puppet-glance
Code Issues Proposed changes

Deprecate the swift_store_config_file parameter 

Because we hardcoded the path in the glance_swift_config resource, We
don't expect the swift_store_config_file parameter is set to various
values, but set to the hardcode path, '/etc/glance/glance-swift.conf'
in almost all cases.
The parameter is deprecated by this change, and will be removed and
hardcoded in a future release.

Change-Id: Ie4a8b933200e25c69fc1ac4985acab486d8a62c8
This commit is contained in:
Takashi Kajinami 2020-12-22 08:06:34 +09:00
parent 26e26d115d
commit 7f1729e9ae
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,9 +61,6 @@
# [*swift_store_region*] # [*swift_store_region*]
# Optional. Default: $::os_service_default. # Optional. Default: $::os_service_default.
# #
# [*swift_store_config_file*]
# Optional. Default: '/etc/glance/glance-swift.conf'
#
# [*default_swift_reference*] # [*default_swift_reference*]
# Optional. The reference to the default swift # Optional. The reference to the default swift
# account/backing store parameters to use for adding # account/backing store parameters to use for adding
@ -81,6 +78,11 @@
# end users. # end users.
# Defaults to $::os_service_default. # Defaults to $::os_service_default.
# #
# DEPRECATED PARAMETERS
#
# [*swift_store_config_file*]
# Optional. Default: '/etc/glance/glance-swift.conf'
#
define glance::backend::multistore::swift( define glance::backend::multistore::swift(
$swift_store_user, $swift_store_user,
$swift_store_key, $swift_store_key,
@ -94,11 +96,12 @@ define glance::backend::multistore::swift(
$swift_store_create_container_on_put = $::os_service_default, $swift_store_create_container_on_put = $::os_service_default,
$swift_store_endpoint_type = 'internalURL', $swift_store_endpoint_type = 'internalURL',
$swift_store_region = $::os_service_default, $swift_store_region = $::os_service_default,
$swift_store_config_file = '/etc/glance/glance-swift.conf',
$default_swift_reference = 'ref1', $default_swift_reference = 'ref1',
$swift_buffer_on_upload = $::os_service_default, $swift_buffer_on_upload = $::os_service_default,
$swift_upload_buffer_dir = $::os_service_default, $swift_upload_buffer_dir = $::os_service_default,
$store_description = $::os_service_default, $store_description = $::os_service_default,
# DEPRECATED PARAMETERS
$swift_store_config_file = undef,
) { ) {
include glance::deps include glance::deps
@ -107,6 +110,13 @@ define glance::backend::multistore::swift(
Class['swift::client'] -> Anchor['glance::install::end'] Class['swift::client'] -> Anchor['glance::install::end']
Service<| tag == 'swift-service' |> -> Service['glance-api'] Service<| tag == 'swift-service' |> -> Service['glance-api']
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'
}
glance_api_config { glance_api_config {
"${name}/swift_store_region": value => $swift_store_region; "${name}/swift_store_region": value => $swift_store_region;
"${name}/swift_store_container": value => $swift_store_container; "${name}/swift_store_container": value => $swift_store_container;
@ -114,7 +124,7 @@ define glance::backend::multistore::swift(
"${name}/swift_store_large_object_size": value => $swift_store_large_object_size; "${name}/swift_store_large_object_size": value => $swift_store_large_object_size;
"${name}/swift_store_large_object_chunk_size": value => $swift_store_large_object_chunk_size; "${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_endpoint_type": value => $swift_store_endpoint_type;
"${name}/swift_store_config_file": value => $swift_store_config_file; "${name}/swift_store_config_file": value => $swift_store_config_file_real;
"${name}/default_swift_reference": value => $default_swift_reference; "${name}/default_swift_reference": value => $default_swift_reference;
"${name}/swift_buffer_on_upload": value => $swift_buffer_on_upload; "${name}/swift_buffer_on_upload": value => $swift_buffer_on_upload;
"${name}/swift_upload_buffer_dir": value => $swift_upload_buffer_dir; "${name}/swift_upload_buffer_dir": value => $swift_upload_buffer_dir;

1
manifests/backend/swift.pp
View File

@ -91,7 +91,6 @@ class glance::backend::swift(
swift_store_create_container_on_put => $swift_store_create_container_on_put, swift_store_create_container_on_put => $swift_store_create_container_on_put,
swift_store_endpoint_type => $swift_store_endpoint_type, swift_store_endpoint_type => $swift_store_endpoint_type,
swift_store_region => $swift_store_region, swift_store_region => $swift_store_region,
swift_store_config_file => '/etc/glance/glance-swift.conf',
default_swift_reference => $default_swift_reference, default_swift_reference => $default_swift_reference,
store_description => undef, store_description => undef,
} }

5
releasenotes/notes/deprecate-swift_store_config_file-ba548fab5c5971be.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The ``glance::backend::multistore::swift::swift_store_config_file``
parameter has been deprecated and will be removed in a future release.