openstack
/
puppet-glance
Code Issues Proposed changes

Merge "Deprecate unused options of reserved store"

This commit is contained in:
Zuul 2023-03-17 09:19:05 +00:00 committed by Gerrit Code Review
parent 2cdc2b2176 51f4256e79
commit 951936517b
3 changed files with 65 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
manifests/backend/reserved/staging.pp
View File

@ -23,29 +23,46 @@
# (optional) Directory where dist images are stored.
# Defaults to $facts['os_service_default'].
#
# [*filesystem_store_file_perm*]
# (optional) File access permissions for the image files.
# Defaults to $facts['os_service_default'].
#
# [*filesystem_store_chunk_size*]
# (optional) Chunk size, in bytes.
# Defaults to $facts['os_service_default'].
#
# DEPRECATED PARAMETERS
#
# [*filesystem_store_file_perm*]
# (optional) File access permissions for the image files.
# Defaults to $facts['os_service_default'].
#
# [*filesystem_thin_provisioning*]
# (optional) Boolean describing if thin provisioning is enabled or not
# Defaults to $facts['os_service_default']
#
class glance::backend::reserved::staging(
$filesystem_store_datadir = $facts['os_service_default'],
$filesystem_store_file_perm = $facts['os_service_default'],
$filesystem_store_chunk_size = $facts['os_service_default'],
$filesystem_thin_provisioning = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$filesystem_store_file_perm = undef,
$filesystem_thin_provisioning = undef,
) {
if $filesystem_store_file_perm != undef {
warning("The filesystem_store_file_perm parameter has been deprecated and \
will be removed in a future release")
}
if $filesystem_thin_provisioning != undef {
warning("The filesystem_thin_provisioning parameter has been deprecated and \
will be removed in a future release")
}
glance_api_config {
'os_glance_staging_store/filesystem_store_datadir': value => $filesystem_store_datadir;
'os_glance_staging_store/filesystem_store_file_perm': value => $filesystem_store_file_perm;
'os_glance_staging_store/filesystem_store_chunk_size': value => $filesystem_store_chunk_size;
'os_glance_staging_store/filesystem_thin_provisioning': value => $filesystem_thin_provisioning;
'os_glance_staging_store/filesystem_store_datadir':
value => $filesystem_store_datadir;
'os_glance_staging_store/filesystem_store_file_perm':
value => pick($filesystem_store_file_perm, $facts['os_service_default']);
'os_glance_staging_store/filesystem_store_chunk_size':
value => $filesystem_store_chunk_size;
'os_glance_staging_store/filesystem_thin_provisioning':
value => pick($filesystem_thin_provisioning, $facts['os_service_default']);
}
}

39
manifests/backend/reserved/tasks.pp
View File

@ -23,29 +23,46 @@
# (optional) Directory where dist images are stored.
# Defaults to $facts['os_service_default'].
#
# [*filesystem_store_file_perm*]
# (optional) File access permissions for the image files.
# Defaults to $facts['os_service_default'].
#
# [*filesystem_store_chunk_size*]
# (optional) Chunk size, in bytes.
# Defaults to $facts['os_service_default'].
#
# DEPRECATED PARAMETERS
#
# [*filesystem_store_file_perm*]
# (optional) File access permissions for the image files.
# Defaults to undef.
#
# [*filesystem_thin_provisioning*]
# (optional) Boolean describing if thin provisioning is enabled or not
# Defaults to $facts['os_service_default']
# Defaults to undef.
#
class glance::backend::reserved::tasks(
$filesystem_store_datadir = $facts['os_service_default'],
$filesystem_store_file_perm = $facts['os_service_default'],
$filesystem_store_chunk_size = $facts['os_service_default'],
$filesystem_thin_provisioning = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$filesystem_store_file_perm = undef,
$filesystem_thin_provisioning = undef,
) {
if $filesystem_store_file_perm != undef {
warning("The filesystem_store_file_perm parameter has been deprecated and \
will be removed in a future release")
}
if $filesystem_thin_provisioning != undef {
warning("The filesystem_thin_provisioning parameter has been deprecated and \
will be removed in a future release")
}
glance_api_config {
'os_glance_tasks_store/filesystem_store_datadir': value => $filesystem_store_datadir;
'os_glance_tasks_store/filesystem_store_file_perm': value => $filesystem_store_file_perm;
'os_glance_tasks_store/filesystem_store_chunk_size': value => $filesystem_store_chunk_size;
'os_glance_tasks_store/filesystem_thin_provisioning': value => $filesystem_thin_provisioning;
'os_glance_tasks_store/filesystem_store_datadir':
value => $filesystem_store_datadir;
'os_glance_tasks_store/filesystem_store_file_perm':
value => pick($filesystem_store_file_perm, $facts['os_service_default']);
'os_glance_tasks_store/filesystem_store_chunk_size':
value => $filesystem_store_chunk_size;
'os_glance_tasks_store/filesystem_thin_provisioning':
value => pick($filesystem_thin_provisioning, $facts['os_service_default']);
}
}

10
releasenotes/notes/deprecate-unused-reserved-store-opts-e9f0656c2850594a.yaml Normal file
View File

@ -0,0 +1,10 @@
---
deprecations:
- |
The following parmeters were deprecated and will be removed in a future
release.
- ``glance::backend::reserved::staging::filesystem_store_file_perm``
- ``glance::backend::reserved::staging::filesystem_thin_provisioning``
- ``glance::backend::reserved::tasks::filesystem_store_file_perm``
- ``glance::backend::reserved::tasks::filesystem_thin_provisioning``