Merge "api: Deprecate ineffective scrub_time"
This commit is contained in:
commit
da1bde38a2
|
@ -25,10 +25,6 @@
|
||||||
# (optional) Number of Glance API worker processes to start
|
# (optional) Number of Glance API worker processes to start
|
||||||
# Default: $::os_workers.
|
# Default: $::os_workers.
|
||||||
#
|
#
|
||||||
# [*scrub_time*]
|
|
||||||
# (optional) The amount of time in seconds to delay before performing a delete.
|
|
||||||
# Defaults to $::os_service_default.
|
|
||||||
#
|
|
||||||
# [*delayed_delete*]
|
# [*delayed_delete*]
|
||||||
# (optional) Turn on/off delayed delete.
|
# (optional) Turn on/off delayed delete.
|
||||||
# Defaults to $::os_service_default.
|
# Defaults to $::os_service_default.
|
||||||
|
@ -317,13 +313,16 @@
|
||||||
# Example:
|
# Example:
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
|
# [*scrub_time*]
|
||||||
|
# (optional) The amount of time in seconds to delay before performing a delete.
|
||||||
|
# Defaults to undef
|
||||||
|
#
|
||||||
class glance::api(
|
class glance::api(
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
$bind_host = $::os_service_default,
|
$bind_host = $::os_service_default,
|
||||||
$bind_port = '9292',
|
$bind_port = '9292',
|
||||||
$backlog = $::os_service_default,
|
$backlog = $::os_service_default,
|
||||||
$workers = $::os_workers,
|
$workers = $::os_workers,
|
||||||
$scrub_time = $::os_service_default,
|
|
||||||
$delayed_delete = $::os_service_default,
|
$delayed_delete = $::os_service_default,
|
||||||
$auth_strategy = 'keystone',
|
$auth_strategy = 'keystone',
|
||||||
$pipeline = 'keystone',
|
$pipeline = 'keystone',
|
||||||
|
@ -389,6 +388,7 @@ class glance::api(
|
||||||
$keymgr_encryption_auth_url = undef,
|
$keymgr_encryption_auth_url = undef,
|
||||||
$validate = undef,
|
$validate = undef,
|
||||||
$validation_options = undef,
|
$validation_options = undef,
|
||||||
|
$scrub_time = undef,
|
||||||
) inherits glance {
|
) inherits glance {
|
||||||
|
|
||||||
include glance::deps
|
include glance::deps
|
||||||
|
@ -439,6 +439,13 @@ removed in a future realse. Use glance::api::db::database_max_overflow instead')
|
||||||
warning('The glance::api::validation_options parameter has been deprecated and has no effect')
|
warning('The glance::api::validation_options parameter has been deprecated and has no effect')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if $scrub_time != undef {
|
||||||
|
warning('The glance::scrub_time parameter is deprerecated and has no effect')
|
||||||
|
}
|
||||||
|
glance_api_config {
|
||||||
|
'DEFAULT/scrub_time': ensure => absent;
|
||||||
|
}
|
||||||
|
|
||||||
if $sync_db {
|
if $sync_db {
|
||||||
include glance::db::sync
|
include glance::db::sync
|
||||||
include glance::db::metadefs
|
include glance::db::metadefs
|
||||||
|
@ -467,7 +474,6 @@ removed in a future realse. Use glance::api::db::database_max_overflow instead')
|
||||||
'DEFAULT/workers': value => $workers;
|
'DEFAULT/workers': value => $workers;
|
||||||
'DEFAULT/show_image_direct_url': value => $show_image_direct_url;
|
'DEFAULT/show_image_direct_url': value => $show_image_direct_url;
|
||||||
'DEFAULT/location_strategy': value => $location_strategy;
|
'DEFAULT/location_strategy': value => $location_strategy;
|
||||||
'DEFAULT/scrub_time': value => $scrub_time;
|
|
||||||
'DEFAULT/delayed_delete': value => $delayed_delete;
|
'DEFAULT/delayed_delete': value => $delayed_delete;
|
||||||
'DEFAULT/enforce_secure_rbac': value => $enforce_secure_rbac;
|
'DEFAULT/enforce_secure_rbac': value => $enforce_secure_rbac;
|
||||||
'DEFAULT/use_keystone_limits': value => $use_keystone_limits;
|
'DEFAULT/use_keystone_limits': value => $use_keystone_limits;
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The ``glance::api::scrub_time`` parameter has been deprecated and has no
|
||||||
|
effect.
|
|
@ -22,7 +22,6 @@ describe 'glance::api' do
|
||||||
:location_strategy => '<SERVICE DEFAULT>',
|
:location_strategy => '<SERVICE DEFAULT>',
|
||||||
:purge_config => false,
|
:purge_config => false,
|
||||||
:delayed_delete => '<SERVICE DEFAULT>',
|
:delayed_delete => '<SERVICE DEFAULT>',
|
||||||
:scrub_time => '<SERVICE DEFAULT>',
|
|
||||||
:enforce_secure_rbac => '<SERVICE DEFAULT>',
|
:enforce_secure_rbac => '<SERVICE DEFAULT>',
|
||||||
:use_keystone_limits => '<SERVICE DEFAULT>',
|
:use_keystone_limits => '<SERVICE DEFAULT>',
|
||||||
:image_cache_dir => '/var/lib/glance/image-cache',
|
:image_cache_dir => '/var/lib/glance/image-cache',
|
||||||
|
@ -71,7 +70,6 @@ describe 'glance::api' do
|
||||||
:filesystem_store_file_perm => '0644',
|
:filesystem_store_file_perm => '0644',
|
||||||
:location_strategy => 'store_type',
|
:location_strategy => 'store_type',
|
||||||
:delayed_delete => 'true',
|
:delayed_delete => 'true',
|
||||||
:scrub_time => '10',
|
|
||||||
:enforce_secure_rbac => 'true',
|
:enforce_secure_rbac => 'true',
|
||||||
:use_keystone_limits => 'true',
|
:use_keystone_limits => 'true',
|
||||||
:image_cache_dir => '/tmp/glance',
|
:image_cache_dir => '/tmp/glance',
|
||||||
|
@ -137,7 +135,6 @@ describe 'glance::api' do
|
||||||
'show_multiple_locations',
|
'show_multiple_locations',
|
||||||
'location_strategy',
|
'location_strategy',
|
||||||
'delayed_delete',
|
'delayed_delete',
|
||||||
'scrub_time',
|
|
||||||
'enforce_secure_rbac',
|
'enforce_secure_rbac',
|
||||||
'use_keystone_limits',
|
'use_keystone_limits',
|
||||||
'image_cache_dir',
|
'image_cache_dir',
|
||||||
|
|
Loading…
Reference in New Issue