diff --git a/manifests/api.pp b/manifests/api.pp index 8e21ee8e..6dab3f0c 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -251,10 +251,6 @@ # properties. # 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*] # (optional) The path to a file which contains the metadata to be returned # with any location associated with the filesystem store @@ -330,7 +326,6 @@ class glance::api( $default_store = undef, $multi_store = false, $show_multiple_locations = undef, - $scrub_time = undef, $filesystem_store_metadata_file = undef, $filesystem_store_file_perm = undef, $pipeline = undef, @@ -341,13 +336,6 @@ class glance::api( include glance::policy 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| { if getvar($fs_opt) != undef { warning("The ${fs_opt} parameter has been deprecated and will be removed.") diff --git a/releasenotes/notes/remove-api-scrub_time-d2eadc583428757e.yaml b/releasenotes/notes/remove-api-scrub_time-d2eadc583428757e.yaml new file mode 100644 index 00000000..64caa371 --- /dev/null +++ b/releasenotes/notes/remove-api-scrub_time-d2eadc583428757e.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``glance::api::scrub_time`` parameter has been removed.