From 9b2eb48e417349fae394ca88bdd5b6dcf28a574a Mon Sep 17 00:00:00 2001 From: Mike Carden Date: Fri, 4 Mar 2016 10:48:44 +1100 Subject: [PATCH] Remove deprecated config variables 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 --- templates/glance-api.conf.j2 | 1 - templates/glance-scrubber.conf.j2 | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2 index 8696c12c..a1eccf85 100644 --- a/templates/glance-api.conf.j2 +++ b/templates/glance-api.conf.j2 @@ -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 diff --git a/templates/glance-scrubber.conf.j2 b/templates/glance-scrubber.conf.j2 index 0769b989..5c044207 100644 --- a/templates/glance-scrubber.conf.j2 +++ b/templates/glance-scrubber.conf.j2 @@ -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 }}