openstack/openstack-ansible-os_glance
Code Issues Proposed changes

Remove deprecated config variables

Browse Source 
According to the Liberty release notes, the scrubber_datadir,
cleanup_scrubber and cleanup_scrubber_time config options have
been deprecated. This commit removes them from the OSA glance role.

Change-Id: I8dace469cfbf481f2d018bceacf4e30c4b434408
This commit is contained in:
Mike Carden 2016-03-04 10:48:44 +11:00
parent 1c42c8483d
commit 9b2eb48e41
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
templates/glance-api.conf.j2
View File

@ -36,7 +36,6 @@ rpc_backend = {{ glance_rpc_backend }}
delayed_delete = False
scrub_time = 43200
scrubber_datadir = {{ glance_system_user_home }}/scrubber/
image_cache_dir = {{ glance_system_user_home }}/cache/
# defaults to true if RBD is used as default store

10
templates/glance-scrubber.conf.j2
View File

@ -16,16 +16,6 @@ daemon = False
# Loop time between checking for new items to schedule for delete
wakeup_time = 300
# Directory that the scrubber will use to remind itself of what to delete
# Make sure this is also set in glance-api.conf
scrubber_datadir = {{ glance_system_user_home }}/scrubber
# Only one server in your deployment should be designated the cleanup host
cleanup_scrubber = False
# pending_delete items older than this time are candidates for cleanup
cleanup_scrubber_time = 86400
# Address to find the registry server for cleanups
registry_host = {{ glance_registry_bind_address }}