Revert "Deprecate unused options of reserved store"
This reverts commit 51f4256e79
.
Reason for revert:
Glance does call the add api of the filesystem store which uses these
options.
examples:
https://github.com/openstack/glance/blob/93e14113a/glance/api/v2/image_data.py#L372
https://github.com/openstack/glance/blob/93e14113a/glance/async_/flows/base_import.py#L159
Change-Id: I41387f67b647db7a96f975224b33112f3fa83ddd
This commit is contained in:
parent
e3d7edce5f
commit
f4848f57cd
|
@ -23,46 +23,29 @@
|
|||
# (optional) Directory where dist images are stored.
|
||||
# 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_store_chunk_size*]
|
||||
# (optional) Chunk size, in bytes.
|
||||
# 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'],
|
||||
# DEPRECATED PARAMETERS
|
||||
$filesystem_store_file_perm = undef,
|
||||
$filesystem_thin_provisioning = undef,
|
||||
$filesystem_thin_provisioning = $facts['os_service_default'],
|
||||
) {
|
||||
|
||||
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 => 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']);
|
||||
'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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,46 +23,29 @@
|
|||
# (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 undef.
|
||||
# Defaults to $facts['os_service_default']
|
||||
#
|
||||
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'],
|
||||
# DEPRECATED PARAMETERS
|
||||
$filesystem_store_file_perm = undef,
|
||||
$filesystem_thin_provisioning = undef,
|
||||
$filesystem_thin_provisioning = $facts['os_service_default'],
|
||||
) {
|
||||
|
||||
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 => 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']);
|
||||
'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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
---
|
||||
fixes:
|
||||
- |
|
||||
Deprecation mark has been removed from the following parameters, because
|
||||
these parameters are actually effective.
|
||||
|
||||
- ``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``
|
Loading…
Reference in New Issue