[config-ref] update Object Storage container reconciler config

* Split container reconciler configuration into a separate file
* Add description for no help options
* Remove unnecessary RST markup

backport: mitaka

Change-Id: I27b49c471a460fc01a50a508e684822d949a20f9
Partial-Bug: #1605040

doc/config-reference/source/object-storage.rst

@@ -11,6 +11,7 @@ Object Storage service
    object-storage/object-expirer.rst
    object-storage/container-server.rst
    object-storage/container-sync-realms.rst
+   object-storage/container-reconciler.rst
    object-storage/configure.rst
    object-storage/features.rst
    object-storage/configure-s3.rst

doc/config-reference/source/object-storage/configure.rst

@@ -8,29 +8,6 @@ configurations. Default configuration options appear in the ``[DEFAULT]``
 section. You can override the default values by setting values in the other
 sections.
 
-Container reconciler configuration
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Find an example container sync realms configuration at
-``etc/container-reconciler.conf-sample`` in the source code repository.
-
-The available configuration options are:
-
-.. include:: ../tables/swift-container-reconciler-DEFAULT.rst
-.. include:: ../tables/swift-container-reconciler-app-proxy-server.rst
-.. include:: ../tables/swift-container-reconciler-container-reconciler.rst
-.. include:: ../tables/swift-container-reconciler-filter-cache.rst
-.. include:: ../tables/swift-container-reconciler-filter-catch_errors.rst
-.. include:: ../tables/swift-container-reconciler-filter-proxy-logging.rst
-.. include:: ../tables/swift-container-reconciler-pipeline-main.rst
-
-Sample container sync reconciler configuration file
----------------------------------------------------
-
-.. remote-code-block:: ini
-
-   https://git.openstack.org/cgit/openstack/swift/plain/etc/container-reconciler.conf-sample?h=stable/mitaka
-
 Account server configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

doc/config-reference/source/object-storage/container-reconciler.rst

@@ -0,0 +1,23 @@
+==================================
+Container reconciler configuration
+==================================
+
+Find an example container sync realms configuration at
+``etc/container-reconciler.conf-sample`` in the source code repository.
+
+The available configuration options are:
+
+.. include:: ../tables/swift-container-reconciler-DEFAULT.rst
+.. include:: ../tables/swift-container-reconciler-app-proxy-server.rst
+.. include:: ../tables/swift-container-reconciler-container-reconciler.rst
+.. include:: ../tables/swift-container-reconciler-filter-cache.rst
+.. include:: ../tables/swift-container-reconciler-filter-catch_errors.rst
+.. include:: ../tables/swift-container-reconciler-filter-proxy-logging.rst
+.. include:: ../tables/swift-container-reconciler-pipeline-main.rst
+
+Sample container sync reconciler configuration file
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. remote-code-block:: ini
+
+   https://git.openstack.org/cgit/openstack/swift/plain/etc/container-reconciler.conf-sample?h=stable/mitaka

doc/config-reference/source/tables/swift-container-reconciler-DEFAULT.rst

@@ -11,7 +11,7 @@
      - Description
    * - ``log_address`` = ``/dev/log``
      - Location where syslog sends the logs to
-   * - ``log_custom_handlers`` = `` ``
+   * - ``log_custom_handlers`` =
      - Comma-separated list of functions to call to setup custom log handlers.
    * - ``log_facility`` = ``LOG_LOCAL0``
      - Syslog log facility
@@ -23,13 +23,13 @@
      - Defines the probability of sending a sample for any given event or timing measurement.
    * - ``log_statsd_host`` = ``localhost``
      - If not set, the StatsD feature is disabled.
-   * - ``log_statsd_metric_prefix`` = `` ``
+   * - ``log_statsd_metric_prefix`` =
      - Value will be prepended to every metric sent to the StatsD server.
    * - ``log_statsd_port`` = ``8125``
      - Port value for the StatsD server.
    * - ``log_statsd_sample_rate_factor`` = ``1.0``
      - Not recommended to set this to a value less than 1.0, if frequency of logging is too high, tune the log_statsd_default_sample_rate instead.
-   * - ``log_udp_host`` = `` ``
+   * - ``log_udp_host`` =
      - If not set, the UDP receiver for syslog is disabled.
    * - ``log_udp_port`` = ``514``
      - Port value for UDP receiver, if enabled.

doc/config-reference/source/tables/swift-container-reconciler-container-reconciler.rst

@@ -14,4 +14,4 @@
    * - ``reclaim_age`` = ``604800``
      - Time elapsed in seconds before an object can be reclaimed
    * - ``request_tries`` = ``3``
-     - No help text available for this option.
+     - Server errors from requests will be retried by default

doc/config-reference/source/tables/swift-container-reconciler-pipeline-main.rst

@@ -10,4 +10,4 @@
    * - Configuration option = Default value
      - Description
    * - ``pipeline`` = ``catch_errors proxy-logging cache proxy-server``
-     - No help text available for this option.
+     - Pipeline to use for processing operations.