From 1298204e8e26f062198c3d5343c9600f3c74bd33 Mon Sep 17 00:00:00 2001
From: Danny <danny.h@inwinstack.com>
Date: Thu, 23 Jul 2015 10:57:56 +0800
Subject: [PATCH] Purge dead file-backed scrubber queue code

message:
remove the scrubber_datadir, cleanup_scrubber, and
cleanup_scrubber_time options.

Change-Id: I1ff2106ecb544f8a86365bc874b980ae663f21e2
Closes-Bug: #1474604
---
 doc/common/tables/glance-imagecache.xml            | 12 ------------
 ...on_image-service-sample-configuration-files.xml | 14 +++-----------
 .../glance.flagmappings                            |  3 ---
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/doc/common/tables/glance-imagecache.xml b/doc/common/tables/glance-imagecache.xml
index d04f33a0eb..cd99669c8d 100644
--- a/doc/common/tables/glance-imagecache.xml
+++ b/doc/common/tables/glance-imagecache.xml
@@ -17,14 +17,6 @@
       <tr>
         <th colspan="2">[DEFAULT]</th>
       </tr>
-      <tr>
-        <td><option>cleanup_scrubber</option> = <replaceable>False</replaceable></td>
-        <td>(BoolOpt) DEPRECATED. TO BE REMOVED IN THE LIBERTY RELEASE. A boolean that determines if the scrubber should clean up the files it uses for taking data. Only one server in your deployment should be designated the cleanup host.</td>
-      </tr>
-      <tr>
-        <td><option>cleanup_scrubber_time</option> = <replaceable>86400</replaceable></td>
-        <td>(IntOpt) DEPRECATED. TO BE REMOVED IN THE LIBERTY RELEASE. Items must have a modified time that is older than this value in order to be candidates for cleanup.</td>
-      </tr>
       <tr>
         <td><option>delayed_delete</option> = <replaceable>False</replaceable></td>
         <td>(BoolOpt) Turn on/off delayed delete.</td>
@@ -53,10 +45,6 @@
         <td><option>scrub_time</option> = <replaceable>0</replaceable></td>
         <td>(IntOpt) The amount of time in seconds to delay before performing a delete.</td>
       </tr>
-      <tr>
-        <td><option>scrubber_datadir</option> = <replaceable>/var/lib/glance/scrubber</replaceable></td>
-        <td>(StrOpt) Directory that the scrubber will use to track information about what to delete. Make sure this is set in glance-api.conf and glance-scrubber.conf.</td>
-      </tr>
     </tbody>
   </table>
 </para>
diff --git a/doc/config-reference/image-service/section_image-service-sample-configuration-files.xml b/doc/config-reference/image-service/section_image-service-sample-configuration-files.xml
index f78a6ff339..76e933de9f 100644
--- a/doc/config-reference/image-service/section_image-service-sample-configuration-files.xml
+++ b/doc/config-reference/image-service/section_image-service-sample-configuration-files.xml
@@ -47,18 +47,10 @@
             <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-registry-paste.ini?h=stable/kilo"/></programlisting>
         </section>
         <section xml:id="section_glance-scrubber.conf">
-            <title>glance-scrubber.conf</title>
-            <para><command>glance-scrubber</command> is a utility for the Image service that cleans
-            up images that have been deleted; its configuration is stored in the
+                <title>glance-scrubber.conf</title>
+                <para><command>glance-scrubber</command> is a utility for the Image service that cleans up images that have been deleted; its configuration is stored in the
                 <filename>glance-scrubber.conf</filename> file.</para>
-            <para>Multiple instances of <systemitem>glance-scrubber</systemitem> can be run in a single
-            deployment, but only one of them can be designated as the
-                <systemitem>cleanup_scrubber</systemitem> in the
-                <filename>glance-scrubber.conf</filename> file. The
-                <systemitem>cleanup_scrubber</systemitem> coordinates other
-                <systemitem>glance-scrubber</systemitem> instances by maintaining the master queue
-            of images that need to be removed.</para>
-            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-scrubber.conf?h=stable/kilo"/></programlisting>
+                <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-scrubber.conf?h=stable/kilo"/></programlisting>
         </section>
         <section xml:id="section_glance-policy.json">
             <title>policy.json</title>
diff --git a/tools/autogenerate-config-flagmappings/glance.flagmappings b/tools/autogenerate-config-flagmappings/glance.flagmappings
index a81864692e..a59cc51617 100644
--- a/tools/autogenerate-config-flagmappings/glance.flagmappings
+++ b/tools/autogenerate-config-flagmappings/glance.flagmappings
@@ -17,8 +17,6 @@ bind_port common
 ca_file ca
 cert_file ca
 chunksize replicator
-cleanup_scrubber imagecache
-cleanup_scrubber_time imagecache
 client_socket_timeout api
 command replicator
 control_exchange amqp
@@ -104,7 +102,6 @@ rpc_zmq_matchmaker zeromq
 rpc_zmq_port zeromq
 rpc_zmq_topic_backlog zeromq
 scrub_time imagecache
-scrubber_datadir imagecache
 send_identity_headers api
 show_image_direct_url common
 show_multiple_locations api