api: Remove deprecated scrub_time
This parameter was deprecated during the past cycle because it is not
used by glance-api actually[1], and has had no effect since then.
[1] bd6fb8f175
Change-Id: Ic4f2ed44fa4e7263d2e4c6d3ae3e255fdf798aa2
This commit is contained in:
parent
d61047c7d3
commit
89f9a6b3fb
|
@ -251,10 +251,6 @@
|
||||||
# properties.
|
# properties.
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
# [*scrub_time*]
|
|
||||||
# (optional) The amount of time in seconds to delay before performing a delete.
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
# [*filesystem_store_metadata_file*]
|
# [*filesystem_store_metadata_file*]
|
||||||
# (optional) The path to a file which contains the metadata to be returned
|
# (optional) The path to a file which contains the metadata to be returned
|
||||||
# with any location associated with the filesystem store
|
# with any location associated with the filesystem store
|
||||||
|
@ -330,7 +326,6 @@ class glance::api(
|
||||||
$default_store = undef,
|
$default_store = undef,
|
||||||
$multi_store = false,
|
$multi_store = false,
|
||||||
$show_multiple_locations = undef,
|
$show_multiple_locations = undef,
|
||||||
$scrub_time = undef,
|
|
||||||
$filesystem_store_metadata_file = undef,
|
$filesystem_store_metadata_file = undef,
|
||||||
$filesystem_store_file_perm = undef,
|
$filesystem_store_file_perm = undef,
|
||||||
$pipeline = undef,
|
$pipeline = undef,
|
||||||
|
@ -341,13 +336,6 @@ class glance::api(
|
||||||
include glance::policy
|
include glance::policy
|
||||||
include glance::api::db
|
include glance::api::db
|
||||||
|
|
||||||
if $scrub_time != undef {
|
|
||||||
warning('The glance::scrub_time parameter is deprecated and has no effect')
|
|
||||||
}
|
|
||||||
glance_api_config {
|
|
||||||
'DEFAULT/scrub_time': ensure => absent;
|
|
||||||
}
|
|
||||||
|
|
||||||
['filesystem_store_metadata_file', 'filesystem_store_file_perm'].each |String $fs_opt| {
|
['filesystem_store_metadata_file', 'filesystem_store_file_perm'].each |String $fs_opt| {
|
||||||
if getvar($fs_opt) != undef {
|
if getvar($fs_opt) != undef {
|
||||||
warning("The ${fs_opt} parameter has been deprecated and will be removed.")
|
warning("The ${fs_opt} parameter has been deprecated and will be removed.")
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The ``glance::api::scrub_time`` parameter has been removed.
|
Loading…
Reference in New Issue