diff --git a/doc/config-reference/source/bare-metal/config-options.rst b/doc/config-reference/source/bare-metal/config-options.rst
index a1ef896b29..645bbb3137 100644
--- a/doc/config-reference/source/bare-metal/config-options.rst
+++ b/doc/config-reference/source/bare-metal/config-options.rst
@@ -24,7 +24,6 @@ service configuration options.
 .. include:: ../tables/ironic-ipmi.rst
 .. include:: ../tables/ironic-irmc.rst
 .. include:: ../tables/ironic-keystone.rst
-.. include:: ../tables/ironic-logging.rst
 .. include:: ../tables/ironic-neutron.rst
 .. include:: ../tables/ironic-pxe.rst
 .. include:: ../tables/ironic-redis.rst
diff --git a/doc/config-reference/source/block-storage/volume-misc.rst b/doc/config-reference/source/block-storage/volume-misc.rst
index e4830e3151..ff65b53c8d 100644
--- a/doc/config-reference/source/block-storage/volume-misc.rst
+++ b/doc/config-reference/source/block-storage/volume-misc.rst
@@ -25,7 +25,6 @@ These options can also be set in the ``cinder.conf`` file.
 .. include:: ../tables/cinder-images.rst
 .. include:: ../tables/cinder-infortrend.rst
 .. include:: ../tables/cinder-keymgr.rst
-.. include:: ../tables/cinder-logging.rst
 .. include:: ../tables/cinder-nas.rst
 .. include:: ../tables/cinder-profiler.rst
 .. include:: ../tables/cinder-pure.rst
diff --git a/doc/config-reference/source/data-processing-service.rst b/doc/config-reference/source/data-processing-service.rst
index 3237edafcd..7164e66c25 100644
--- a/doc/config-reference/source/data-processing-service.rst
+++ b/doc/config-reference/source/data-processing-service.rst
@@ -23,7 +23,6 @@ service configuration options:
 .. include:: tables/sahara-clients.rst
 .. include:: tables/sahara-common.rst
 .. include:: tables/sahara-domain.rst
-.. include:: tables/sahara-logging.rst
 .. include:: tables/sahara-object_store_access.rst
 .. include:: tables/sahara-rabbitmq.rst
 .. include:: tables/sahara-redis.rst
diff --git a/doc/config-reference/source/database.rst b/doc/config-reference/source/database.rst
index 203708532b..90499c8429 100644
--- a/doc/config-reference/source/database.rst
+++ b/doc/config-reference/source/database.rst
@@ -26,7 +26,6 @@ configuration options.
 .. include:: tables/trove-dns.rst
 .. include:: tables/trove-guestagent.rst
 .. include:: tables/trove-heat.rst
-.. include:: tables/trove-logging.rst
 .. include:: tables/trove-network.rst
 .. include:: tables/trove-nova.rst
 .. include:: tables/trove-quota.rst
diff --git a/doc/config-reference/source/identity/options.rst b/doc/config-reference/source/identity/options.rst
index 8ba235cbab..481d6acec6 100644
--- a/doc/config-reference/source/identity/options.rst
+++ b/doc/config-reference/source/identity/options.rst
@@ -21,7 +21,6 @@ service options.
 .. include:: ../tables/keystone-identity.rst
 .. include:: ../tables/keystone-kvs.rst
 .. include:: ../tables/keystone-ldap.rst
-.. include:: ../tables/keystone-logging.rst
 .. include:: ../tables/keystone-mapping.rst
 .. include:: ../tables/keystone-memcache.rst
 .. include:: ../tables/keystone-oauth.rst
diff --git a/doc/config-reference/source/image.rst b/doc/config-reference/source/image.rst
index 39d9771e54..c05ea09cb3 100644
--- a/doc/config-reference/source/image.rst
+++ b/doc/config-reference/source/image.rst
@@ -30,7 +30,6 @@ a comprehensive list.
 
 .. include:: tables/glance-common.rst
 .. include:: tables/glance-imagecache.rst
-.. include:: tables/glance-logging.rst
 .. include:: tables/glance-profiler.rst
 .. include:: tables/glance-redis.rst
 .. include:: tables/glance-registry.rst
diff --git a/doc/config-reference/source/message.rst b/doc/config-reference/source/message.rst
index 5459f38c64..78404d4a45 100644
--- a/doc/config-reference/source/message.rst
+++ b/doc/config-reference/source/message.rst
@@ -7,7 +7,6 @@ Message service
 
    message/zaqar-conf.rst
    message/api.rst
-   message/zaqar-logging.rst
    message/zaqar-drivers.rst
    message/zaqar-storage-drivers.rst
    message/zaqar-transport-drivers.rst
diff --git a/doc/config-reference/source/message/zaqar-logging.rst b/doc/config-reference/source/message/zaqar-logging.rst
deleted file mode 100644
index d9373414d9..0000000000
--- a/doc/config-reference/source/message/zaqar-logging.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-===============
-Logging options
-===============
-
-You can use the ``zaqar.conf`` file to configure where the Messaging and
-Notifications service logs events, the logging levels and log formats.
-
-To customize logging for the Message service, use the following configuration
-settings in the ``[DEFAULT]`` section:
-
-.. include:: ../tables/zaqar-logging.rst
diff --git a/doc/config-reference/source/networking/lbaas.rst b/doc/config-reference/source/networking/lbaas.rst
index d274a92300..f777e7dd37 100644
--- a/doc/config-reference/source/networking/lbaas.rst
+++ b/doc/config-reference/source/networking/lbaas.rst
@@ -28,7 +28,6 @@ to configure the octavia service.
 .. include:: ../tables/octavia-auth_token.rst
 .. include:: ../tables/octavia-cache.rst
 .. include:: ../tables/octavia-common.rst
-.. include:: ../tables/octavia-logging.rst
 .. include:: ../tables/octavia-rabbitmq.rst
 .. include:: ../tables/octavia-redis.rst
 .. include:: ../tables/octavia-rpc.rst
diff --git a/doc/config-reference/source/networking/networking_options_reference.rst b/doc/config-reference/source/networking/networking_options_reference.rst
index 4f8206b3ad..13d4be0c20 100644
--- a/doc/config-reference/source/networking/networking_options_reference.rst
+++ b/doc/config-reference/source/networking/networking_options_reference.rst
@@ -201,13 +201,6 @@ agent.
 
 .. include:: ../tables/neutron-l3_agent.rst
 
-Logging
-~~~~~~~
-
-Use the following options to alter logging settings.
-
-.. include:: ../tables/neutron-logging.rst
-
 Metadata Agent
 ~~~~~~~~~~~~~~
 
diff --git a/doc/config-reference/source/orchestration.rst b/doc/config-reference/source/orchestration.rst
index 4dcd5237f1..75ba7c7336 100644
--- a/doc/config-reference/source/orchestration.rst
+++ b/doc/config-reference/source/orchestration.rst
@@ -30,7 +30,6 @@ configuration options:
 .. include:: tables/heat-common.rst
 .. include:: tables/heat-crypt.rst
 .. include:: tables/heat-loadbalancer.rst
-.. include:: tables/heat-logging.rst
 .. include:: tables/heat-quota.rst
 .. include:: tables/heat-redis.rst
 .. include:: tables/heat-testing.rst
diff --git a/doc/config-reference/source/shared-file-systems/misc.rst b/doc/config-reference/source/shared-file-systems/misc.rst
index c6bb4cbb02..a9609873ac 100644
--- a/doc/config-reference/source/shared-file-systems/misc.rst
+++ b/doc/config-reference/source/shared-file-systems/misc.rst
@@ -10,7 +10,6 @@ These options can also be set in the ``manila.conf`` file.
 .. include:: ../tables/manila-compute.rst
 .. include:: ../tables/manila-ganesha.rst
 .. include:: ../tables/manila-hnas.rst
-.. include:: ../tables/manila-logging.rst
 .. include:: ../tables/manila-quota.rst
 .. include:: ../tables/manila-redis.rst
 .. include:: ../tables/manila-san.rst
diff --git a/doc/config-reference/source/tables/aodh-logging.rst b/doc/config-reference/source/tables/aodh-logging.rst
deleted file mode 100644
index 4f0802810a..0000000000
--- a/doc/config-reference/source/tables/aodh-logging.rst
+++ /dev/null
@@ -1,60 +0,0 @@
-..
-    Warning: Do not edit this file. It is automatically generated from the
-    software project's code and your changes will be overwritten.
-
-    The tool to generate this file lives in openstack-doc-tools repository.
-
-    Please make any changes needed in the code, then run the
-    autogenerate-config-doc tool from the openstack-doc-tools repository, or
-    ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _aodh-logging:
-
-.. list-table:: Description of logging configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[DEFAULT]**
-     -
-   * - ``debug`` = ``False``
-     - (Boolean) If set to true, the logging level will be set to DEBUG instead of the default INFO level.
-   * - ``default_log_levels`` = ``amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN, taskflow=WARN, keystoneauth=WARN, oslo.cache=INFO, dogpile.core.dogpile=INFO``
-     - (List) List of package logging levels in logger=LEVEL pairs. This option is ignored if log_config_append is set.
-   * - ``fatal_deprecations`` = ``False``
-     - (Boolean) Enables or disables fatal status of deprecations.
-   * - ``instance_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance that is passed with the log message.
-   * - ``instance_uuid_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance UUID that is passed with the log message.
-   * - ``log_config_append`` = ``None``
-     - (String) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation. Note that when logging configuration files are used then all logging configuration is set in the configuration file and other logging configuration options are ignored (for example, logging_context_format_string).
-   * - ``log_date_format`` = ``%Y-%m-%d %H:%M:%S``
-     - (String) Defines the format string for %%(asctime)s in log records. Default: %(default)s . This option is ignored if log_config_append is set.
-   * - ``log_dir`` = ``None``
-     - (String) (Optional) The base directory used for relative log_file paths. This option is ignored if log_config_append is set.
-   * - ``log_file`` = ``None``
-     - (String) (Optional) Name of log file to send logging output to. If no default is set, logging will go to stderr as defined by use_stderr. This option is ignored if log_config_append is set.
-   * - ``logging_context_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s``
-     - (String) Format string to use for log messages with context.
-   * - ``logging_debug_format_suffix`` = ``%(funcName)s %(pathname)s:%(lineno)d``
-     - (String) Additional data to append to log message when logging level for the message is DEBUG.
-   * - ``logging_default_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s``
-     - (String) Format string to use for log messages when context is undefined.
-   * - ``logging_exception_prefix`` = ``%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s``
-     - (String) Prefix each line of exception output with this format.
-   * - ``logging_user_identity_format`` = ``%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s``
-     - (String) Defines the format string for %(user_identity)s that is used in logging_context_format_string.
-   * - ``publish_errors`` = ``False``
-     - (Boolean) Enables or disables publication of error events.
-   * - ``syslog_log_facility`` = ``LOG_USER``
-     - (String) Syslog facility to receive log lines. This option is ignored if log_config_append is set.
-   * - ``use_stderr`` = ``True``
-     - (Boolean) Log output to standard error. This option is ignored if log_config_append is set.
-   * - ``use_syslog`` = ``False``
-     - (Boolean) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. This option is ignored if log_config_append is set.
-   * - ``verbose`` = ``True``
-     - (Boolean) DEPRECATED: If set to false, the logging level will be set to WARNING instead of the default INFO level.
-   * - ``watch_log_file`` = ``False``
-     - (Boolean) Uses logging handler designed to watch file system. When log file is moved or removed this handler will open a new log file with specified path instantaneously. It makes sense only if log_file option is specified and Linux platform is used. This option is ignored if log_config_append is set.
diff --git a/doc/config-reference/source/tables/ceilometer-logging.rst b/doc/config-reference/source/tables/ceilometer-logging.rst
deleted file mode 100644
index e810c9d37a..0000000000
--- a/doc/config-reference/source/tables/ceilometer-logging.rst
+++ /dev/null
@@ -1,60 +0,0 @@
-..
-    Warning: Do not edit this file. It is automatically generated from the
-    software project's code and your changes will be overwritten.
-
-    The tool to generate this file lives in openstack-doc-tools repository.
-
-    Please make any changes needed in the code, then run the
-    autogenerate-config-doc tool from the openstack-doc-tools repository, or
-    ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _ceilometer-logging:
-
-.. list-table:: Description of logging configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[DEFAULT]**
-     -
-   * - ``debug`` = ``False``
-     - (Boolean) If set to true, the logging level will be set to DEBUG instead of the default INFO level.
-   * - ``default_log_levels`` = ``amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN, taskflow=WARN, keystoneauth=WARN, oslo.cache=INFO, dogpile.core.dogpile=INFO``
-     - (List) List of package logging levels in logger=LEVEL pairs. This option is ignored if log_config_append is set.
-   * - ``fatal_deprecations`` = ``False``
-     - (Boolean) Enables or disables fatal status of deprecations.
-   * - ``instance_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance that is passed with the log message.
-   * - ``instance_uuid_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance UUID that is passed with the log message.
-   * - ``log_config_append`` = ``None``
-     - (String) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation. Note that when logging configuration files are used then all logging configuration is set in the configuration file and other logging configuration options are ignored (for example, logging_context_format_string).
-   * - ``log_date_format`` = ``%Y-%m-%d %H:%M:%S``
-     - (String) Defines the format string for %%(asctime)s in log records. Default: %(default)s . This option is ignored if log_config_append is set.
-   * - ``log_dir`` = ``None``
-     - (String) (Optional) The base directory used for relative log_file paths. This option is ignored if log_config_append is set.
-   * - ``log_file`` = ``None``
-     - (String) (Optional) Name of log file to send logging output to. If no default is set, logging will go to stderr as defined by use_stderr. This option is ignored if log_config_append is set.
-   * - ``logging_context_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s``
-     - (String) Format string to use for log messages with context.
-   * - ``logging_debug_format_suffix`` = ``%(funcName)s %(pathname)s:%(lineno)d``
-     - (String) Additional data to append to log message when logging level for the message is DEBUG.
-   * - ``logging_default_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s``
-     - (String) Format string to use for log messages when context is undefined.
-   * - ``logging_exception_prefix`` = ``%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s``
-     - (String) Prefix each line of exception output with this format.
-   * - ``logging_user_identity_format`` = ``%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s``
-     - (String) Defines the format string for %(user_identity)s that is used in logging_context_format_string.
-   * - ``publish_errors`` = ``False``
-     - (Boolean) Enables or disables publication of error events.
-   * - ``syslog_log_facility`` = ``LOG_USER``
-     - (String) Syslog facility to receive log lines. This option is ignored if log_config_append is set.
-   * - ``use_stderr`` = ``True``
-     - (Boolean) Log output to standard error. This option is ignored if log_config_append is set.
-   * - ``use_syslog`` = ``False``
-     - (Boolean) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. This option is ignored if log_config_append is set.
-   * - ``verbose`` = ``True``
-     - (Boolean) DEPRECATED: If set to false, the logging level will be set to WARNING instead of the default INFO level.
-   * - ``watch_log_file`` = ``False``
-     - (Boolean) Uses logging handler designed to watch file system. When log file is moved or removed this handler will open a new log file with specified path instantaneously. It makes sense only if log_file option is specified and Linux platform is used. This option is ignored if log_config_append is set.
diff --git a/doc/config-reference/source/tables/cinder-common.rst b/doc/config-reference/source/tables/cinder-common.rst
index abc2916809..17b50a5c03 100644
--- a/doc/config-reference/source/tables/cinder-common.rst
+++ b/doc/config-reference/source/tables/cinder-common.rst
@@ -54,6 +54,8 @@
      - (Boolean) If this is set to True, attachment of volumes for image transfer will be aborted when multipathd is not running. Otherwise, it will fallback to single path.
    * - ``executor_thread_pool_size`` = ``64``
      - (Integer) Size of executor thread pool.
+   * - ``fatal_exception_format_errors`` = ``False``
+     - (Boolean) Make exception message format errors fatal.
    * - ``host`` = ``localhost``
      - (String) Name of this node. This can be an opaque identifier. It is not necessarily a host name, FQDN, or IP address.
    * - ``iet_conf`` = ``/etc/iet/ietd.conf``
@@ -126,5 +128,3 @@
      - (Boolean) Option to enable/disable CHAP authentication for targets.
    * - ``use_forwarded_for`` = ``False``
      - (Boolean) Treat X-Forwarded-For as the canonical remote address. Only enable this if you have a sanitizing proxy.
-   * - ``watch_log_file`` = ``False``
-     - (Boolean) Uses logging handler designed to watch file system. When log file is moved or removed this handler will open a new log file with specified path instantaneously. It makes sense only if log_file option is specified and Linux platform is used. This option is ignored if log_config_append is set.
diff --git a/doc/config-reference/source/tables/cinder-logging.rst b/doc/config-reference/source/tables/cinder-logging.rst
deleted file mode 100644
index f718310be4..0000000000
--- a/doc/config-reference/source/tables/cinder-logging.rst
+++ /dev/null
@@ -1,60 +0,0 @@
-..
-    Warning: Do not edit this file. It is automatically generated from the
-    software project's code and your changes will be overwritten.
-
-    The tool to generate this file lives in openstack-doc-tools repository.
-
-    Please make any changes needed in the code, then run the
-    autogenerate-config-doc tool from the openstack-doc-tools repository, or
-    ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _cinder-logging:
-
-.. list-table:: Description of logging configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[DEFAULT]**
-     -
-   * - ``debug`` = ``False``
-     - (Boolean) If set to true, the logging level will be set to DEBUG instead of the default INFO level.
-   * - ``default_log_levels`` = ``amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN, taskflow=WARN, keystoneauth=WARN, oslo.cache=INFO, dogpile.core.dogpile=INFO``
-     - (List) List of package logging levels in logger=LEVEL pairs. This option is ignored if log_config_append is set.
-   * - ``fatal_deprecations`` = ``False``
-     - (Boolean) Enables or disables fatal status of deprecations.
-   * - ``fatal_exception_format_errors`` = ``False``
-     - (Boolean) Make exception message format errors fatal.
-   * - ``instance_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance that is passed with the log message.
-   * - ``instance_uuid_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance UUID that is passed with the log message.
-   * - ``log_config_append`` = ``None``
-     - (String) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation. Note that when logging configuration files are used then all logging configuration is set in the configuration file and other logging configuration options are ignored (for example, logging_context_format_string).
-   * - ``log_date_format`` = ``%Y-%m-%d %H:%M:%S``
-     - (String) Defines the format string for %%(asctime)s in log records. Default: %(default)s . This option is ignored if log_config_append is set.
-   * - ``log_dir`` = ``None``
-     - (String) (Optional) The base directory used for relative log_file paths. This option is ignored if log_config_append is set.
-   * - ``log_file`` = ``None``
-     - (String) (Optional) Name of log file to send logging output to. If no default is set, logging will go to stderr as defined by use_stderr. This option is ignored if log_config_append is set.
-   * - ``logging_context_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s``
-     - (String) Format string to use for log messages with context.
-   * - ``logging_debug_format_suffix`` = ``%(funcName)s %(pathname)s:%(lineno)d``
-     - (String) Additional data to append to log message when logging level for the message is DEBUG.
-   * - ``logging_default_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s``
-     - (String) Format string to use for log messages when context is undefined.
-   * - ``logging_exception_prefix`` = ``%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s``
-     - (String) Prefix each line of exception output with this format.
-   * - ``logging_user_identity_format`` = ``%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s``
-     - (String) Defines the format string for %(user_identity)s that is used in logging_context_format_string.
-   * - ``publish_errors`` = ``False``
-     - (Boolean) Enables or disables publication of error events.
-   * - ``syslog_log_facility`` = ``LOG_USER``
-     - (String) Syslog facility to receive log lines. This option is ignored if log_config_append is set.
-   * - ``use_stderr`` = ``True``
-     - (Boolean) Log output to standard error. This option is ignored if log_config_append is set.
-   * - ``use_syslog`` = ``False``
-     - (Boolean) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. This option is ignored if log_config_append is set.
-   * - ``verbose`` = ``True``
-     - (Boolean) DEPRECATED: If set to false, the logging level will be set to WARNING instead of the default INFO level.
diff --git a/doc/config-reference/source/tables/glance-logging.rst b/doc/config-reference/source/tables/glance-logging.rst
deleted file mode 100644
index 48172c5eeb..0000000000
--- a/doc/config-reference/source/tables/glance-logging.rst
+++ /dev/null
@@ -1,60 +0,0 @@
-..
-    Warning: Do not edit this file. It is automatically generated from the
-    software project's code and your changes will be overwritten.
-
-    The tool to generate this file lives in openstack-doc-tools repository.
-
-    Please make any changes needed in the code, then run the
-    autogenerate-config-doc tool from the openstack-doc-tools repository, or
-    ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _glance-logging:
-
-.. list-table:: Description of logging configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[DEFAULT]**
-     -
-   * - ``debug`` = ``False``
-     - (Boolean) If set to true, the logging level will be set to DEBUG instead of the default INFO level.
-   * - ``default_log_levels`` = ``amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN, taskflow=WARN, keystoneauth=WARN, oslo.cache=INFO, dogpile.core.dogpile=INFO``
-     - (List) List of package logging levels in logger=LEVEL pairs. This option is ignored if log_config_append is set.
-   * - ``fatal_deprecations`` = ``False``
-     - (Boolean) Enables or disables fatal status of deprecations.
-   * - ``instance_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance that is passed with the log message.
-   * - ``instance_uuid_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance UUID that is passed with the log message.
-   * - ``log_config_append`` = ``None``
-     - (String) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation. Note that when logging configuration files are used then all logging configuration is set in the configuration file and other logging configuration options are ignored (for example, logging_context_format_string).
-   * - ``log_date_format`` = ``%Y-%m-%d %H:%M:%S``
-     - (String) Defines the format string for %%(asctime)s in log records. Default: %(default)s . This option is ignored if log_config_append is set.
-   * - ``log_dir`` = ``None``
-     - (String) (Optional) The base directory used for relative log_file paths. This option is ignored if log_config_append is set.
-   * - ``log_file`` = ``None``
-     - (String) (Optional) Name of log file to send logging output to. If no default is set, logging will go to stderr as defined by use_stderr. This option is ignored if log_config_append is set.
-   * - ``logging_context_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s``
-     - (String) Format string to use for log messages with context.
-   * - ``logging_debug_format_suffix`` = ``%(funcName)s %(pathname)s:%(lineno)d``
-     - (String) Additional data to append to log message when logging level for the message is DEBUG.
-   * - ``logging_default_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s``
-     - (String) Format string to use for log messages when context is undefined.
-   * - ``logging_exception_prefix`` = ``%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s``
-     - (String) Prefix each line of exception output with this format.
-   * - ``logging_user_identity_format`` = ``%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s``
-     - (String) Defines the format string for %(user_identity)s that is used in logging_context_format_string.
-   * - ``publish_errors`` = ``False``
-     - (Boolean) Enables or disables publication of error events.
-   * - ``syslog_log_facility`` = ``LOG_USER``
-     - (String) Syslog facility to receive log lines. This option is ignored if log_config_append is set.
-   * - ``use_stderr`` = ``True``
-     - (Boolean) Log output to standard error. This option is ignored if log_config_append is set.
-   * - ``use_syslog`` = ``False``
-     - (Boolean) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. This option is ignored if log_config_append is set.
-   * - ``verbose`` = ``True``
-     - (Boolean) DEPRECATED: If set to false, the logging level will be set to WARNING instead of the default INFO level.
-   * - ``watch_log_file`` = ``False``
-     - (Boolean) Uses logging handler designed to watch file system. When log file is moved or removed this handler will open a new log file with specified path instantaneously. It makes sense only if log_file option is specified and Linux platform is used. This option is ignored if log_config_append is set.
diff --git a/doc/config-reference/source/tables/heat-common.rst b/doc/config-reference/source/tables/heat-common.rst
index e287e80edd..d52e038a10 100644
--- a/doc/config-reference/source/tables/heat-common.rst
+++ b/doc/config-reference/source/tables/heat-common.rst
@@ -50,8 +50,6 @@
      - (List) List of directories to search for plug-ins.
    * - ``reauthentication_auth_method`` =
      - (String) Allow reauthentication on token expiry, such that long-running tasks may complete. Note this defeats the expiry of any provided user tokens.
-   * - ``watch_log_file`` = ``False``
-     - (Boolean) Uses logging handler designed to watch file system. When log file is moved or removed this handler will open a new log file with specified path instantaneously. It makes sense only if log_file option is specified and Linux platform is used. This option is ignored if log_config_append is set.
    * - **[constraint_validation_cache]**
      -
    * - ``caching`` = ``True``
diff --git a/doc/config-reference/source/tables/heat-logging.rst b/doc/config-reference/source/tables/heat-logging.rst
deleted file mode 100644
index aaa41e763e..0000000000
--- a/doc/config-reference/source/tables/heat-logging.rst
+++ /dev/null
@@ -1,58 +0,0 @@
-..
-    Warning: Do not edit this file. It is automatically generated from the
-    software project's code and your changes will be overwritten.
-
-    The tool to generate this file lives in openstack-doc-tools repository.
-
-    Please make any changes needed in the code, then run the
-    autogenerate-config-doc tool from the openstack-doc-tools repository, or
-    ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _heat-logging:
-
-.. list-table:: Description of logging configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[DEFAULT]**
-     -
-   * - ``debug`` = ``False``
-     - (Boolean) If set to true, the logging level will be set to DEBUG instead of the default INFO level.
-   * - ``default_log_levels`` = ``amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN, taskflow=WARN, keystoneauth=WARN, oslo.cache=INFO, dogpile.core.dogpile=INFO``
-     - (List) List of package logging levels in logger=LEVEL pairs. This option is ignored if log_config_append is set.
-   * - ``fatal_deprecations`` = ``False``
-     - (Boolean) Enables or disables fatal status of deprecations.
-   * - ``instance_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance that is passed with the log message.
-   * - ``instance_uuid_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance UUID that is passed with the log message.
-   * - ``log_config_append`` = ``None``
-     - (String) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation. Note that when logging configuration files are used then all logging configuration is set in the configuration file and other logging configuration options are ignored (for example, logging_context_format_string).
-   * - ``log_date_format`` = ``%Y-%m-%d %H:%M:%S``
-     - (String) Defines the format string for %%(asctime)s in log records. Default: %(default)s . This option is ignored if log_config_append is set.
-   * - ``log_dir`` = ``None``
-     - (String) (Optional) The base directory used for relative log_file paths. This option is ignored if log_config_append is set.
-   * - ``log_file`` = ``None``
-     - (String) (Optional) Name of log file to send logging output to. If no default is set, logging will go to stderr as defined by use_stderr. This option is ignored if log_config_append is set.
-   * - ``logging_context_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s``
-     - (String) Format string to use for log messages with context.
-   * - ``logging_debug_format_suffix`` = ``%(funcName)s %(pathname)s:%(lineno)d``
-     - (String) Additional data to append to log message when logging level for the message is DEBUG.
-   * - ``logging_default_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s``
-     - (String) Format string to use for log messages when context is undefined.
-   * - ``logging_exception_prefix`` = ``%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s``
-     - (String) Prefix each line of exception output with this format.
-   * - ``logging_user_identity_format`` = ``%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s``
-     - (String) Defines the format string for %(user_identity)s that is used in logging_context_format_string.
-   * - ``publish_errors`` = ``False``
-     - (Boolean) Enables or disables publication of error events.
-   * - ``syslog_log_facility`` = ``LOG_USER``
-     - (String) Syslog facility to receive log lines. This option is ignored if log_config_append is set.
-   * - ``use_stderr`` = ``True``
-     - (Boolean) Log output to standard error. This option is ignored if log_config_append is set.
-   * - ``use_syslog`` = ``False``
-     - (Boolean) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. This option is ignored if log_config_append is set.
-   * - ``verbose`` = ``True``
-     - (Boolean) DEPRECATED: If set to false, the logging level will be set to WARNING instead of the default INFO level.
diff --git a/doc/config-reference/source/tables/ironic-common.rst b/doc/config-reference/source/tables/ironic-common.rst
index 5048b109fb..4d86cd50f8 100644
--- a/doc/config-reference/source/tables/ironic-common.rst
+++ b/doc/config-reference/source/tables/ironic-common.rst
@@ -20,6 +20,8 @@
      -
    * - ``bindir`` = ``/usr/local/bin``
      - (String) Directory where ironic binaries are installed.
+   * - ``debug_tracebacks_in_api`` = ``False``
+     - (Boolean) Return server tracebacks in the API response for any error responses. WARNING: this is insecure and should not be used in a production environment.
    * - ``enabled_drivers`` = ``pxe_ipmitool``
      - (List) Specify the list of drivers to load during service initialization. Missing drivers, or drivers which fail to initialize, will prevent the conductor service from starting. The option default is a recommended set of production-oriented drivers. A complete list of drivers present on your system may be found by enumerating the "ironic.drivers" entrypoint. An example may be found in the developer documentation online.
    * - ``executor_thread_pool_size`` = ``64``
diff --git a/doc/config-reference/source/tables/ironic-logging.rst b/doc/config-reference/source/tables/ironic-logging.rst
deleted file mode 100644
index 58c7cb0a26..0000000000
--- a/doc/config-reference/source/tables/ironic-logging.rst
+++ /dev/null
@@ -1,62 +0,0 @@
-..
-    Warning: Do not edit this file. It is automatically generated from the
-    software project's code and your changes will be overwritten.
-
-    The tool to generate this file lives in openstack-doc-tools repository.
-
-    Please make any changes needed in the code, then run the
-    autogenerate-config-doc tool from the openstack-doc-tools repository, or
-    ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _ironic-logging:
-
-.. list-table:: Description of logging configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[DEFAULT]**
-     -
-   * - ``debug`` = ``False``
-     - (Boolean) If set to true, the logging level will be set to DEBUG instead of the default INFO level.
-   * - ``debug_tracebacks_in_api`` = ``False``
-     - (Boolean) Return server tracebacks in the API response for any error responses. WARNING: this is insecure and should not be used in a production environment.
-   * - ``default_log_levels`` = ``amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN, taskflow=WARN, keystoneauth=WARN, oslo.cache=INFO, dogpile.core.dogpile=INFO``
-     - (List) List of package logging levels in logger=LEVEL pairs. This option is ignored if log_config_append is set.
-   * - ``fatal_exception_format_errors`` = ``False``
-     - (Boolean) Used if there is a formatting error when generating an exception message (a programming error). If True, raise an exception; if False, use the unformatted message.
-   * - ``instance_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance that is passed with the log message.
-   * - ``instance_uuid_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance UUID that is passed with the log message.
-   * - ``log_config_append`` = ``None``
-     - (String) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation. Note that when logging configuration files are used then all logging configuration is set in the configuration file and other logging configuration options are ignored (for example, logging_context_format_string).
-   * - ``log_date_format`` = ``%Y-%m-%d %H:%M:%S``
-     - (String) Defines the format string for %%(asctime)s in log records. Default: %(default)s . This option is ignored if log_config_append is set.
-   * - ``log_dir`` = ``None``
-     - (String) (Optional) The base directory used for relative log_file paths. This option is ignored if log_config_append is set.
-   * - ``log_file`` = ``None``
-     - (String) (Optional) Name of log file to send logging output to. If no default is set, logging will go to stderr as defined by use_stderr. This option is ignored if log_config_append is set.
-   * - ``logging_context_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s``
-     - (String) Format string to use for log messages with context.
-   * - ``logging_debug_format_suffix`` = ``%(funcName)s %(pathname)s:%(lineno)d``
-     - (String) Additional data to append to log message when logging level for the message is DEBUG.
-   * - ``logging_default_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s``
-     - (String) Format string to use for log messages when context is undefined.
-   * - ``logging_exception_prefix`` = ``%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s``
-     - (String) Prefix each line of exception output with this format.
-   * - ``logging_user_identity_format`` = ``%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s``
-     - (String) Defines the format string for %(user_identity)s that is used in logging_context_format_string.
-   * - ``publish_errors`` = ``False``
-     - (Boolean) Enables or disables publication of error events.
-   * - ``syslog_log_facility`` = ``LOG_USER``
-     - (String) Syslog facility to receive log lines. This option is ignored if log_config_append is set.
-   * - ``use_stderr`` = ``True``
-     - (Boolean) Log output to standard error. This option is ignored if log_config_append is set.
-   * - ``use_syslog`` = ``False``
-     - (Boolean) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. This option is ignored if log_config_append is set.
-   * - ``verbose`` = ``True``
-     - (Boolean) DEPRECATED: If set to false, the logging level will be set to WARNING instead of the default INFO level.
-   * - ``watch_log_file`` = ``False``
-     - (Boolean) Uses logging handler designed to watch file system. When log file is moved or removed this handler will open a new log file with specified path instantaneously. It makes sense only if log_file option is specified and Linux platform is used. This option is ignored if log_config_append is set.
diff --git a/doc/config-reference/source/tables/keystone-common.rst b/doc/config-reference/source/tables/keystone-common.rst
index 298d82b9d5..c8fdc372a8 100644
--- a/doc/config-reference/source/tables/keystone-common.rst
+++ b/doc/config-reference/source/tables/keystone-common.rst
@@ -20,6 +20,8 @@
      -
    * - ``executor_thread_pool_size`` = ``64``
      - (Integer) Size of executor thread pool.
+   * - ``insecure_debug`` = ``False``
+     - (Boolean) If set to true the server will return information in the response that may allow an unauthenticated or authenticated user to get more information than normal, such as why authentication failed. This may be useful for debugging but is insecure.
    * - ``memcached_servers`` = ``None``
      - (List) Memcached servers or None for in process cache.
    * - **[oslo_concurrency]**
diff --git a/doc/config-reference/source/tables/keystone-logging.rst b/doc/config-reference/source/tables/keystone-logging.rst
deleted file mode 100644
index fa4978f4b6..0000000000
--- a/doc/config-reference/source/tables/keystone-logging.rst
+++ /dev/null
@@ -1,62 +0,0 @@
-..
-    Warning: Do not edit this file. It is automatically generated from the
-    software project's code and your changes will be overwritten.
-
-    The tool to generate this file lives in openstack-doc-tools repository.
-
-    Please make any changes needed in the code, then run the
-    autogenerate-config-doc tool from the openstack-doc-tools repository, or
-    ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _keystone-logging:
-
-.. list-table:: Description of logging configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[DEFAULT]**
-     -
-   * - ``debug`` = ``False``
-     - (Boolean) If set to true, the logging level will be set to DEBUG instead of the default INFO level.
-   * - ``default_log_levels`` = ``amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN, taskflow=WARN, keystoneauth=WARN, oslo.cache=INFO, dogpile.core.dogpile=INFO``
-     - (List) List of package logging levels in logger=LEVEL pairs. This option is ignored if log_config_append is set.
-   * - ``fatal_deprecations`` = ``False``
-     - (Boolean) Enables or disables fatal status of deprecations.
-   * - ``insecure_debug`` = ``False``
-     - (Boolean) If set to true the server will return information in the response that may allow an unauthenticated or authenticated user to get more information than normal, such as why authentication failed. This may be useful for debugging but is insecure.
-   * - ``instance_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance that is passed with the log message.
-   * - ``instance_uuid_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance UUID that is passed with the log message.
-   * - ``log_config_append`` = ``None``
-     - (String) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation. Note that when logging configuration files are used then all logging configuration is set in the configuration file and other logging configuration options are ignored (for example, logging_context_format_string).
-   * - ``log_date_format`` = ``%Y-%m-%d %H:%M:%S``
-     - (String) Defines the format string for %%(asctime)s in log records. Default: %(default)s . This option is ignored if log_config_append is set.
-   * - ``log_dir`` = ``None``
-     - (String) (Optional) The base directory used for relative log_file paths. This option is ignored if log_config_append is set.
-   * - ``log_file`` = ``None``
-     - (String) (Optional) Name of log file to send logging output to. If no default is set, logging will go to stderr as defined by use_stderr. This option is ignored if log_config_append is set.
-   * - ``logging_context_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s``
-     - (String) Format string to use for log messages with context.
-   * - ``logging_debug_format_suffix`` = ``%(funcName)s %(pathname)s:%(lineno)d``
-     - (String) Additional data to append to log message when logging level for the message is DEBUG.
-   * - ``logging_default_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s``
-     - (String) Format string to use for log messages when context is undefined.
-   * - ``logging_exception_prefix`` = ``%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s``
-     - (String) Prefix each line of exception output with this format.
-   * - ``logging_user_identity_format`` = ``%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s``
-     - (String) Defines the format string for %(user_identity)s that is used in logging_context_format_string.
-   * - ``publish_errors`` = ``False``
-     - (Boolean) Enables or disables publication of error events.
-   * - ``syslog_log_facility`` = ``LOG_USER``
-     - (String) Syslog facility to receive log lines. This option is ignored if log_config_append is set.
-   * - ``use_stderr`` = ``True``
-     - (Boolean) Log output to standard error. This option is ignored if log_config_append is set.
-   * - ``use_syslog`` = ``False``
-     - (Boolean) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. This option is ignored if log_config_append is set.
-   * - ``verbose`` = ``True``
-     - (Boolean) DEPRECATED: If set to false, the logging level will be set to WARNING instead of the default INFO level.
-   * - ``watch_log_file`` = ``False``
-     - (Boolean) Uses logging handler designed to watch file system. When log file is moved or removed this handler will open a new log file with specified path instantaneously. It makes sense only if log_file option is specified and Linux platform is used. This option is ignored if log_config_append is set.
diff --git a/doc/config-reference/source/tables/manila-common.rst b/doc/config-reference/source/tables/manila-common.rst
index b6b575f9fe..9e349e1d4d 100644
--- a/doc/config-reference/source/tables/manila-common.rst
+++ b/doc/config-reference/source/tables/manila-common.rst
@@ -34,6 +34,8 @@
      - (String) The topic data nodes listen on.
    * - ``enable_new_services`` = ``True``
      - (Boolean) Services to be added to the available pool on create.
+   * - ``fatal_exception_format_errors`` = ``False``
+     - (Boolean) Whether to make exception message format errors fatal.
    * - ``host`` = ``localhost``
      - (String) Name of this node. This can be an opaque identifier. It is not necessarily a hostname, FQDN, or IP address.
    * - ``max_over_subscription_ratio`` = ``20.0``
diff --git a/doc/config-reference/source/tables/manila-logging.rst b/doc/config-reference/source/tables/manila-logging.rst
deleted file mode 100644
index 14bf260af8..0000000000
--- a/doc/config-reference/source/tables/manila-logging.rst
+++ /dev/null
@@ -1,62 +0,0 @@
-..
-    Warning: Do not edit this file. It is automatically generated from the
-    software project's code and your changes will be overwritten.
-
-    The tool to generate this file lives in openstack-doc-tools repository.
-
-    Please make any changes needed in the code, then run the
-    autogenerate-config-doc tool from the openstack-doc-tools repository, or
-    ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _manila-logging:
-
-.. list-table:: Description of Logging configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[DEFAULT]**
-     -
-   * - ``debug`` = ``False``
-     - (Boolean) If set to true, the logging level will be set to DEBUG instead of the default INFO level.
-   * - ``default_log_levels`` = ``amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN, taskflow=WARN, keystoneauth=WARN, oslo.cache=INFO, dogpile.core.dogpile=INFO``
-     - (List) List of package logging levels in logger=LEVEL pairs. This option is ignored if log_config_append is set.
-   * - ``fatal_deprecations`` = ``False``
-     - (Boolean) Enables or disables fatal status of deprecations.
-   * - ``fatal_exception_format_errors`` = ``False``
-     - (Boolean) Whether to make exception message format errors fatal.
-   * - ``instance_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance that is passed with the log message.
-   * - ``instance_uuid_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance UUID that is passed with the log message.
-   * - ``log_config_append`` = ``None``
-     - (String) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation. Note that when logging configuration files are used then all logging configuration is set in the configuration file and other logging configuration options are ignored (for example, logging_context_format_string).
-   * - ``log_date_format`` = ``%Y-%m-%d %H:%M:%S``
-     - (String) Defines the format string for %%(asctime)s in log records. Default: %(default)s . This option is ignored if log_config_append is set.
-   * - ``log_dir`` = ``None``
-     - (String) (Optional) The base directory used for relative log_file paths. This option is ignored if log_config_append is set.
-   * - ``log_file`` = ``None``
-     - (String) (Optional) Name of log file to send logging output to. If no default is set, logging will go to stderr as defined by use_stderr. This option is ignored if log_config_append is set.
-   * - ``logging_context_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s``
-     - (String) Format string to use for log messages with context.
-   * - ``logging_debug_format_suffix`` = ``%(funcName)s %(pathname)s:%(lineno)d``
-     - (String) Additional data to append to log message when logging level for the message is DEBUG.
-   * - ``logging_default_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s``
-     - (String) Format string to use for log messages when context is undefined.
-   * - ``logging_exception_prefix`` = ``%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s``
-     - (String) Prefix each line of exception output with this format.
-   * - ``logging_user_identity_format`` = ``%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s``
-     - (String) Defines the format string for %(user_identity)s that is used in logging_context_format_string.
-   * - ``publish_errors`` = ``False``
-     - (Boolean) Enables or disables publication of error events.
-   * - ``syslog_log_facility`` = ``LOG_USER``
-     - (String) Syslog facility to receive log lines. This option is ignored if log_config_append is set.
-   * - ``use_stderr`` = ``True``
-     - (Boolean) Log output to standard error. This option is ignored if log_config_append is set.
-   * - ``use_syslog`` = ``False``
-     - (Boolean) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. This option is ignored if log_config_append is set.
-   * - ``verbose`` = ``True``
-     - (Boolean) DEPRECATED: If set to false, the logging level will be set to WARNING instead of the default INFO level.
-   * - ``watch_log_file`` = ``False``
-     - (Boolean) Uses logging handler designed to watch file system. When log file is moved or removed this handler will open a new log file with specified path instantaneously. It makes sense only if log_file option is specified and Linux platform is used. This option is ignored if log_config_append is set.
diff --git a/doc/config-reference/source/tables/neutron-api.rst b/doc/config-reference/source/tables/neutron-api.rst
index b06ea5a9d0..40bb2041f1 100644
--- a/doc/config-reference/source/tables/neutron-api.rst
+++ b/doc/config-reference/source/tables/neutron-api.rst
@@ -42,13 +42,21 @@
      - (List) The service plugins Neutron will use
    * - ``tcp_keepidle`` = ``600``
      - (Integer) Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not supported on OS X.
+   * - ``use_ssl`` = ``False``
+     - (Boolean) Enable SSL on the API server
    * - ``wsgi_default_pool_size`` = ``100``
      - (Integer) Size of the pool of greenthreads used by wsgi
    * - ``wsgi_keep_alive`` = ``True``
      - (Boolean) If False, closes the client socket connection explicitly.
+   * - ``wsgi_log_format`` = ``%(client_ip)s "%(request_line)s" status: %(status_code)s  len: %(body_length)s time: %(wall_seconds).7f``
+     - (String) A python format string that is used as the template to generate log lines. The following values can beformatted into it: client_ip, date_time, request_line, status_code, body_length, wall_seconds.
    * - **[oslo_middleware]**
      -
    * - ``max_request_body_size`` = ``114688``
      - (Integer) The maximum body size for each request, in bytes.
    * - ``secure_proxy_ssl_header`` = ``X-Forwarded-Proto``
      - (String) DEPRECATED: The HTTP Header that will be used to determine what the original request protocol scheme was, even if it was hidden by an SSL termination proxy.
+   * - **[oslo_versionedobjects]**
+     -
+   * - ``fatal_exception_format_errors`` = ``False``
+     - (Boolean) Make exception message format errors fatal
diff --git a/doc/config-reference/source/tables/neutron-logging.rst b/doc/config-reference/source/tables/neutron-logging.rst
deleted file mode 100644
index 448f788560..0000000000
--- a/doc/config-reference/source/tables/neutron-logging.rst
+++ /dev/null
@@ -1,68 +0,0 @@
-..
-    Warning: Do not edit this file. It is automatically generated from the
-    software project's code and your changes will be overwritten.
-
-    The tool to generate this file lives in openstack-doc-tools repository.
-
-    Please make any changes needed in the code, then run the
-    autogenerate-config-doc tool from the openstack-doc-tools repository, or
-    ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _neutron-logging:
-
-.. list-table:: Description of logging configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[DEFAULT]**
-     -
-   * - ``debug`` = ``False``
-     - (Boolean) If set to true, the logging level will be set to DEBUG instead of the default INFO level.
-   * - ``default_log_levels`` = ``amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN, taskflow=WARN, keystoneauth=WARN, oslo.cache=INFO, dogpile.core.dogpile=INFO``
-     - (List) List of package logging levels in logger=LEVEL pairs. This option is ignored if log_config_append is set.
-   * - ``fatal_deprecations`` = ``False``
-     - (Boolean) Enables or disables fatal status of deprecations.
-   * - ``instance_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance that is passed with the log message.
-   * - ``instance_uuid_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance UUID that is passed with the log message.
-   * - ``log_config_append`` = ``None``
-     - (String) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation. Note that when logging configuration files are used then all logging configuration is set in the configuration file and other logging configuration options are ignored (for example, logging_context_format_string).
-   * - ``log_date_format`` = ``%Y-%m-%d %H:%M:%S``
-     - (String) Defines the format string for %%(asctime)s in log records. Default: %(default)s . This option is ignored if log_config_append is set.
-   * - ``log_dir`` = ``None``
-     - (String) (Optional) The base directory used for relative log_file paths. This option is ignored if log_config_append is set.
-   * - ``log_file`` = ``None``
-     - (String) (Optional) Name of log file to send logging output to. If no default is set, logging will go to stderr as defined by use_stderr. This option is ignored if log_config_append is set.
-   * - ``logging_context_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s``
-     - (String) Format string to use for log messages with context.
-   * - ``logging_debug_format_suffix`` = ``%(funcName)s %(pathname)s:%(lineno)d``
-     - (String) Additional data to append to log message when logging level for the message is DEBUG.
-   * - ``logging_default_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s``
-     - (String) Format string to use for log messages when context is undefined.
-   * - ``logging_exception_prefix`` = ``%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s``
-     - (String) Prefix each line of exception output with this format.
-   * - ``logging_user_identity_format`` = ``%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s``
-     - (String) Defines the format string for %(user_identity)s that is used in logging_context_format_string.
-   * - ``publish_errors`` = ``False``
-     - (Boolean) Enables or disables publication of error events.
-   * - ``syslog_log_facility`` = ``LOG_USER``
-     - (String) Syslog facility to receive log lines. This option is ignored if log_config_append is set.
-   * - ``use_ssl`` = ``False``
-     - (Boolean) Enable SSL on the API server
-   * - ``use_stderr`` = ``True``
-     - (Boolean) Log output to standard error. This option is ignored if log_config_append is set.
-   * - ``use_syslog`` = ``False``
-     - (Boolean) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. This option is ignored if log_config_append is set.
-   * - ``verbose`` = ``True``
-     - (Boolean) DEPRECATED: If set to false, the logging level will be set to WARNING instead of the default INFO level.
-   * - ``watch_log_file`` = ``False``
-     - (Boolean) Uses logging handler designed to watch file system. When log file is moved or removed this handler will open a new log file with specified path instantaneously. It makes sense only if log_file option is specified and Linux platform is used. This option is ignored if log_config_append is set.
-   * - ``wsgi_log_format`` = ``%(client_ip)s "%(request_line)s" status: %(status_code)s  len: %(body_length)s time: %(wall_seconds).7f``
-     - (String) A python format string that is used as the template to generate log lines. The following values can beformatted into it: client_ip, date_time, request_line, status_code, body_length, wall_seconds.
-   * - **[oslo_versionedobjects]**
-     -
-   * - ``fatal_exception_format_errors`` = ``False``
-     - (Boolean) Make exception message format errors fatal
diff --git a/doc/config-reference/source/tables/nova-common.rst b/doc/config-reference/source/tables/nova-common.rst
index 3ef78dadf0..49bed4d45d 100644
--- a/doc/config-reference/source/tables/nova-common.rst
+++ b/doc/config-reference/source/tables/nova-common.rst
@@ -28,6 +28,8 @@
      - (String) The topic console auth proxy nodes listen on
    * - ``executor_thread_pool_size`` = ``64``
      - (Integer) Size of executor thread pool.
+   * - ``fatal_exception_format_errors`` = ``False``
+     - (Boolean) Make exception message format errors fatal
    * - ``host`` = ``localhost``
      - (String) Name of this node. This can be an opaque identifier. It is not necessarily a hostname, FQDN, or IP address. However, the node name must be valid within an AMQP key, and if using ZeroMQ, a valid hostname, FQDN, or IP address
    * - ``memcached_servers`` = ``None``
diff --git a/doc/config-reference/source/tables/octavia-common.rst b/doc/config-reference/source/tables/octavia-common.rst
index 02442755a7..16884bed0d 100644
--- a/doc/config-reference/source/tables/octavia-common.rst
+++ b/doc/config-reference/source/tables/octavia-common.rst
@@ -38,14 +38,8 @@
      - (Unknown) The port to bind to
    * - ``control_exchange`` = ``octavia``
      - (String) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option.
-   * - ``debug`` = ``False``
-     - (Boolean) If set to true, the logging level will be set to DEBUG instead of the default INFO level.
-   * - ``default_log_levels`` = ``amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN, taskflow=WARN, keystoneauth=WARN, oslo.cache=INFO, dogpile.core.dogpile=INFO``
-     - (List) List of package logging levels in logger=LEVEL pairs. This option is ignored if log_config_append is set.
    * - ``executor_thread_pool_size`` = ``64``
      - (Integer) Size of executor thread pool.
-   * - ``fatal_deprecations`` = ``False``
-     - (Boolean) Enables or disables fatal status of deprecations.
    * - ``host`` = ``localhost``
      - (String) The hostname Octavia is running on
    * - ``octavia_plugins`` = ``hot_plug_plugin``
diff --git a/doc/config-reference/source/tables/octavia-logging.rst b/doc/config-reference/source/tables/octavia-logging.rst
deleted file mode 100644
index 8d497c9560..0000000000
--- a/doc/config-reference/source/tables/octavia-logging.rst
+++ /dev/null
@@ -1,54 +0,0 @@
-..
-    Warning: Do not edit this file. It is automatically generated from the
-    software project's code and your changes will be overwritten.
-
-    The tool to generate this file lives in openstack-doc-tools repository.
-
-    Please make any changes needed in the code, then run the
-    autogenerate-config-doc tool from the openstack-doc-tools repository, or
-    ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _octavia-logging:
-
-.. list-table:: Description of logging configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[DEFAULT]**
-     -
-   * - ``instance_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance that is passed with the log message.
-   * - ``instance_uuid_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance UUID that is passed with the log message.
-   * - ``log_config_append`` = ``None``
-     - (String) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation. Note that when logging configuration files are used then all logging configuration is set in the configuration file and other logging configuration options are ignored (for example, logging_context_format_string).
-   * - ``log_date_format`` = ``%Y-%m-%d %H:%M:%S``
-     - (String) Defines the format string for %%(asctime)s in log records. Default: %(default)s . This option is ignored if log_config_append is set.
-   * - ``log_dir`` = ``None``
-     - (String) (Optional) The base directory used for relative log_file paths. This option is ignored if log_config_append is set.
-   * - ``log_file`` = ``None``
-     - (String) (Optional) Name of log file to send logging output to. If no default is set, logging will go to stderr as defined by use_stderr. This option is ignored if log_config_append is set.
-   * - ``logging_context_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s``
-     - (String) Format string to use for log messages with context.
-   * - ``logging_debug_format_suffix`` = ``%(funcName)s %(pathname)s:%(lineno)d``
-     - (String) Additional data to append to log message when logging level for the message is DEBUG.
-   * - ``logging_default_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s``
-     - (String) Format string to use for log messages when context is undefined.
-   * - ``logging_exception_prefix`` = ``%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s``
-     - (String) Prefix each line of exception output with this format.
-   * - ``logging_user_identity_format`` = ``%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s``
-     - (String) Defines the format string for %(user_identity)s that is used in logging_context_format_string.
-   * - ``publish_errors`` = ``False``
-     - (Boolean) Enables or disables publication of error events.
-   * - ``syslog_log_facility`` = ``LOG_USER``
-     - (String) Syslog facility to receive log lines. This option is ignored if log_config_append is set.
-   * - ``use_stderr`` = ``True``
-     - (Boolean) Log output to standard error. This option is ignored if log_config_append is set.
-   * - ``use_syslog`` = ``False``
-     - (Boolean) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. This option is ignored if log_config_append is set.
-   * - ``verbose`` = ``True``
-     - (Boolean) DEPRECATED: If set to false, the logging level will be set to WARNING instead of the default INFO level.
-   * - ``watch_log_file`` = ``False``
-     - (Boolean) Uses logging handler designed to watch file system. When log file is moved or removed this handler will open a new log file with specified path instantaneously. It makes sense only if log_file option is specified and Linux platform is used. This option is ignored if log_config_append is set.
diff --git a/doc/config-reference/source/tables/sahara-logging.rst b/doc/config-reference/source/tables/sahara-logging.rst
deleted file mode 100644
index c5449b2c9d..0000000000
--- a/doc/config-reference/source/tables/sahara-logging.rst
+++ /dev/null
@@ -1,60 +0,0 @@
-..
-    Warning: Do not edit this file. It is automatically generated from the
-    software project's code and your changes will be overwritten.
-
-    The tool to generate this file lives in openstack-doc-tools repository.
-
-    Please make any changes needed in the code, then run the
-    autogenerate-config-doc tool from the openstack-doc-tools repository, or
-    ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _sahara-logging:
-
-.. list-table:: Description of logging configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[DEFAULT]**
-     -
-   * - ``debug`` = ``False``
-     - (Boolean) If set to true, the logging level will be set to DEBUG instead of the default INFO level.
-   * - ``default_log_levels`` = ``amqplib=WARN, qpid.messaging=INFO, stevedore=INFO, eventlet.wsgi.server=WARN, sqlalchemy=WARN, boto=WARN, suds=INFO, keystone=INFO, paramiko=WARN, requests=WARN, iso8601=WARN, oslo_messaging=INFO, neutronclient=INFO``
-     - (List) List of package logging levels in logger=LEVEL pairs. This option is ignored if log_config_append is set.
-   * - ``fatal_deprecations`` = ``False``
-     - (Boolean) Enables or disables fatal status of deprecations.
-   * - ``instance_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance that is passed with the log message.
-   * - ``instance_uuid_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance UUID that is passed with the log message.
-   * - ``log_config_append`` = ``None``
-     - (String) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation. Note that when logging configuration files are used then all logging configuration is set in the configuration file and other logging configuration options are ignored (for example, logging_context_format_string).
-   * - ``log_date_format`` = ``%Y-%m-%d %H:%M:%S``
-     - (String) Defines the format string for %%(asctime)s in log records. Default: %(default)s . This option is ignored if log_config_append is set.
-   * - ``log_dir`` = ``None``
-     - (String) (Optional) The base directory used for relative log_file paths. This option is ignored if log_config_append is set.
-   * - ``log_file`` = ``None``
-     - (String) (Optional) Name of log file to send logging output to. If no default is set, logging will go to stderr as defined by use_stderr. This option is ignored if log_config_append is set.
-   * - ``logging_context_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s``
-     - (String) Format string to use for log messages with context.
-   * - ``logging_debug_format_suffix`` = ``%(funcName)s %(pathname)s:%(lineno)d``
-     - (String) Additional data to append to log message when logging level for the message is DEBUG.
-   * - ``logging_default_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s``
-     - (String) Format string to use for log messages when context is undefined.
-   * - ``logging_exception_prefix`` = ``%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s``
-     - (String) Prefix each line of exception output with this format.
-   * - ``logging_user_identity_format`` = ``%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s``
-     - (String) Defines the format string for %(user_identity)s that is used in logging_context_format_string.
-   * - ``publish_errors`` = ``False``
-     - (Boolean) Enables or disables publication of error events.
-   * - ``syslog_log_facility`` = ``LOG_USER``
-     - (String) Syslog facility to receive log lines. This option is ignored if log_config_append is set.
-   * - ``use_stderr`` = ``True``
-     - (Boolean) Log output to standard error. This option is ignored if log_config_append is set.
-   * - ``use_syslog`` = ``False``
-     - (Boolean) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. This option is ignored if log_config_append is set.
-   * - ``verbose`` = ``True``
-     - (Boolean) DEPRECATED: If set to false, the logging level will be set to WARNING instead of the default INFO level.
-   * - ``watch_log_file`` = ``False``
-     - (Boolean) Uses logging handler designed to watch file system. When log file is moved or removed this handler will open a new log file with specified path instantaneously. It makes sense only if log_file option is specified and Linux platform is used. This option is ignored if log_config_append is set.
diff --git a/doc/config-reference/source/tables/trove-common.rst b/doc/config-reference/source/tables/trove-common.rst
index 5927926305..99f18b2b84 100644
--- a/doc/config-reference/source/tables/trove-common.rst
+++ b/doc/config-reference/source/tables/trove-common.rst
@@ -32,6 +32,8 @@
      - (Integer) Size of executor thread pool.
    * - ``expected_filetype_suffixes`` = ``json``
      - (List) Filetype endings not to be reattached to an ID by the utils method correct_id_with_req.
+   * - ``format_options`` = ``-m 5``
+     - (String) Options to use when formatting a volume.
    * - ``host`` = ``0.0.0.0``
      - (Unknown) Host to listen for RPC messages.
    * - ``memcached_servers`` = ``None``
@@ -42,6 +44,8 @@
      - (List) A list of module types supported. A module type corresponds to the name of a ModuleDriver.
    * - ``modules_page_size`` = ``20``
      - (Integer) Page size for listing modules.
+   * - ``network_label_regex`` = ``^private$``
+     - (String) Regular expression to match Trove network labels.
    * - ``pybasedir`` = ``/usr/lib/python/site-packages/trove/trove``
      - (String) Directory where the Trove python module is installed.
    * - ``pydev_path`` = ``None``
diff --git a/doc/config-reference/source/tables/trove-logging.rst b/doc/config-reference/source/tables/trove-logging.rst
deleted file mode 100644
index c961517890..0000000000
--- a/doc/config-reference/source/tables/trove-logging.rst
+++ /dev/null
@@ -1,64 +0,0 @@
-..
-    Warning: Do not edit this file. It is automatically generated from the
-    software project's code and your changes will be overwritten.
-
-    The tool to generate this file lives in openstack-doc-tools repository.
-
-    Please make any changes needed in the code, then run the
-    autogenerate-config-doc tool from the openstack-doc-tools repository, or
-    ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _trove-logging:
-
-.. list-table:: Description of logging configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[DEFAULT]**
-     -
-   * - ``debug`` = ``False``
-     - (Boolean) If set to true, the logging level will be set to DEBUG instead of the default INFO level.
-   * - ``default_log_levels`` = ``amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN, taskflow=WARN, keystoneauth=WARN, oslo.cache=INFO, dogpile.core.dogpile=INFO``
-     - (List) List of package logging levels in logger=LEVEL pairs. This option is ignored if log_config_append is set.
-   * - ``fatal_deprecations`` = ``False``
-     - (Boolean) Enables or disables fatal status of deprecations.
-   * - ``format_options`` = ``-m 5``
-     - (String) Options to use when formatting a volume.
-   * - ``instance_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance that is passed with the log message.
-   * - ``instance_uuid_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance UUID that is passed with the log message.
-   * - ``log_config_append`` = ``None``
-     - (String) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation. Note that when logging configuration files are used then all logging configuration is set in the configuration file and other logging configuration options are ignored (for example, logging_context_format_string).
-   * - ``log_date_format`` = ``%Y-%m-%d %H:%M:%S``
-     - (String) Defines the format string for %%(asctime)s in log records. Default: %(default)s . This option is ignored if log_config_append is set.
-   * - ``log_dir`` = ``None``
-     - (String) (Optional) The base directory used for relative log_file paths. This option is ignored if log_config_append is set.
-   * - ``log_file`` = ``None``
-     - (String) (Optional) Name of log file to send logging output to. If no default is set, logging will go to stderr as defined by use_stderr. This option is ignored if log_config_append is set.
-   * - ``logging_context_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s``
-     - (String) Format string to use for log messages with context.
-   * - ``logging_debug_format_suffix`` = ``%(funcName)s %(pathname)s:%(lineno)d``
-     - (String) Additional data to append to log message when logging level for the message is DEBUG.
-   * - ``logging_default_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s``
-     - (String) Format string to use for log messages when context is undefined.
-   * - ``logging_exception_prefix`` = ``%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s``
-     - (String) Prefix each line of exception output with this format.
-   * - ``logging_user_identity_format`` = ``%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s``
-     - (String) Defines the format string for %(user_identity)s that is used in logging_context_format_string.
-   * - ``network_label_regex`` = ``^private$``
-     - (String) Regular expression to match Trove network labels.
-   * - ``publish_errors`` = ``False``
-     - (Boolean) Enables or disables publication of error events.
-   * - ``syslog_log_facility`` = ``LOG_USER``
-     - (String) Syslog facility to receive log lines. This option is ignored if log_config_append is set.
-   * - ``use_stderr`` = ``True``
-     - (Boolean) Log output to standard error. This option is ignored if log_config_append is set.
-   * - ``use_syslog`` = ``False``
-     - (Boolean) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. This option is ignored if log_config_append is set.
-   * - ``verbose`` = ``True``
-     - (Boolean) DEPRECATED: If set to false, the logging level will be set to WARNING instead of the default INFO level.
-   * - ``watch_log_file`` = ``False``
-     - (Boolean) Uses logging handler designed to watch file system. When log file is moved or removed this handler will open a new log file with specified path instantaneously. It makes sense only if log_file option is specified and Linux platform is used. This option is ignored if log_config_append is set.
diff --git a/doc/config-reference/source/tables/zaqar-logging.rst b/doc/config-reference/source/tables/zaqar-logging.rst
deleted file mode 100644
index 2f390c1660..0000000000
--- a/doc/config-reference/source/tables/zaqar-logging.rst
+++ /dev/null
@@ -1,60 +0,0 @@
-..
-    Warning: Do not edit this file. It is automatically generated from the
-    software project's code and your changes will be overwritten.
-
-    The tool to generate this file lives in openstack-doc-tools repository.
-
-    Please make any changes needed in the code, then run the
-    autogenerate-config-doc tool from the openstack-doc-tools repository, or
-    ask for help on the documentation mailing list, IRC channel or meeting.
-
-.. _zaqar-logging:
-
-.. list-table:: Description of logging configuration options
-   :header-rows: 1
-   :class: config-ref-table
-
-   * - Configuration option = Default value
-     - Description
-   * - **[DEFAULT]**
-     -
-   * - ``debug`` = ``False``
-     - (Boolean) If set to true, the logging level will be set to DEBUG instead of the default INFO level.
-   * - ``default_log_levels`` = ``amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN, taskflow=WARN, keystoneauth=WARN, oslo.cache=INFO, dogpile.core.dogpile=INFO``
-     - (List) List of package logging levels in logger=LEVEL pairs. This option is ignored if log_config_append is set.
-   * - ``fatal_deprecations`` = ``False``
-     - (Boolean) Enables or disables fatal status of deprecations.
-   * - ``instance_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance that is passed with the log message.
-   * - ``instance_uuid_format`` = ``"[instance: %(uuid)s] "``
-     - (String) The format for an instance UUID that is passed with the log message.
-   * - ``log_config_append`` = ``None``
-     - (String) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation. Note that when logging configuration files are used then all logging configuration is set in the configuration file and other logging configuration options are ignored (for example, logging_context_format_string).
-   * - ``log_date_format`` = ``%Y-%m-%d %H:%M:%S``
-     - (String) Defines the format string for %%(asctime)s in log records. Default: %(default)s . This option is ignored if log_config_append is set.
-   * - ``log_dir`` = ``None``
-     - (String) (Optional) The base directory used for relative log_file paths. This option is ignored if log_config_append is set.
-   * - ``log_file`` = ``None``
-     - (String) (Optional) Name of log file to send logging output to. If no default is set, logging will go to stderr as defined by use_stderr. This option is ignored if log_config_append is set.
-   * - ``logging_context_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s``
-     - (String) Format string to use for log messages with context.
-   * - ``logging_debug_format_suffix`` = ``%(funcName)s %(pathname)s:%(lineno)d``
-     - (String) Additional data to append to log message when logging level for the message is DEBUG.
-   * - ``logging_default_format_string`` = ``%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s``
-     - (String) Format string to use for log messages when context is undefined.
-   * - ``logging_exception_prefix`` = ``%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s``
-     - (String) Prefix each line of exception output with this format.
-   * - ``logging_user_identity_format`` = ``%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s``
-     - (String) Defines the format string for %(user_identity)s that is used in logging_context_format_string.
-   * - ``publish_errors`` = ``False``
-     - (Boolean) Enables or disables publication of error events.
-   * - ``syslog_log_facility`` = ``LOG_USER``
-     - (String) Syslog facility to receive log lines. This option is ignored if log_config_append is set.
-   * - ``use_stderr`` = ``True``
-     - (Boolean) Log output to standard error. This option is ignored if log_config_append is set.
-   * - ``use_syslog`` = ``False``
-     - (Boolean) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. This option is ignored if log_config_append is set.
-   * - ``verbose`` = ``True``
-     - (Boolean) DEPRECATED: If set to false, the logging level will be set to WARNING instead of the default INFO level.
-   * - ``watch_log_file`` = ``False``
-     - (Boolean) Uses logging handler designed to watch file system. When log file is moved or removed this handler will open a new log file with specified path instantaneously. It makes sense only if log_file option is specified and Linux platform is used. This option is ignored if log_config_append is set.
diff --git a/doc/config-reference/source/telemetry/alarming-config-options.rst b/doc/config-reference/source/telemetry/alarming-config-options.rst
index 26e9c9f00b..f1c3442403 100644
--- a/doc/config-reference/source/telemetry/alarming-config-options.rst
+++ b/doc/config-reference/source/telemetry/alarming-config-options.rst
@@ -9,7 +9,6 @@ Alarming service configuration options.
 .. include:: ../tables/aodh-api.rst
 .. include:: ../tables/aodh-common.rst
 .. include:: ../tables/aodh-coordination.rst
-.. include:: ../tables/aodh-logging.rst
 .. include:: ../tables/aodh-rabbitmq.rst
 .. include:: ../tables/aodh-redis.rst
 .. include:: ../tables/aodh-rpc.rst
diff --git a/doc/config-reference/source/telemetry/telemetry-config-options.rst b/doc/config-reference/source/telemetry/telemetry-config-options.rst
index 5432477c0f..1297fc0766 100644
--- a/doc/config-reference/source/telemetry/telemetry-config-options.rst
+++ b/doc/config-reference/source/telemetry/telemetry-config-options.rst
@@ -19,7 +19,6 @@ configuration options.
 .. include:: ../tables/ceilometer-hyperv.rst
 .. include:: ../tables/ceilometer-inspector.rst
 .. include:: ../tables/ceilometer-ipmi.rst
-.. include:: ../tables/ceilometer-logging.rst
 .. include:: ../tables/ceilometer-magnetodb.rst
 .. include:: ../tables/ceilometer-notification.rst
 .. include:: ../tables/ceilometer-rabbitmq.rst
diff --git a/tools/autogenerate-config-flagmappings/aodh.flagmappings b/tools/autogenerate-config-flagmappings/aodh.flagmappings
index acf15dd94c..f85a631b29 100644
--- a/tools/autogenerate-config-flagmappings/aodh.flagmappings
+++ b/tools/autogenerate-config-flagmappings/aodh.flagmappings
@@ -1,29 +1,29 @@
 alarm_max_actions common
 control_exchange amqp
-debug logging
-default_log_levels logging
+debug disable
+default_log_levels disable
 evaluation_interval common
 event_alarm_cache_ttl common
 event_alarm_topic common
 executor_thread_pool_size common
-fatal_deprecations logging
+fatal_deprecations disable
 host common
 http_timeout common
-instance_format logging
-instance_uuid_format logging
-log_config_append logging
-log_date_format logging
-log_dir logging
-log_file logging
-logging_context_format_string logging
-logging_debug_format_suffix logging
-logging_default_format_string logging
-logging_exception_prefix logging
-logging_user_identity_format logging
+instance_format disable
+instance_uuid_format disable
+log_config_append disable
+log_date_format disable
+log_dir disable
+log_file disable
+logging_context_format_string disable
+logging_debug_format_suffix disable
+logging_default_format_string disable
+logging_exception_prefix disable
+logging_user_identity_format disable
 memcached_servers common
 notifier_topic common
 project_alarm_quota common
-publish_errors logging
+publish_errors disable
 record_history common
 rest_notifier_certificate_file common
 rest_notifier_certificate_key common
@@ -44,14 +44,14 @@ rpc_zmq_matchmaker zeromq
 rpc_zmq_max_port zeromq
 rpc_zmq_min_port zeromq
 rpc_zmq_topic_backlog zeromq
-syslog_log_facility logging
+syslog_log_facility disable
 transport_url amqp
 use_pub_sub zeromq
-use_stderr logging
-use_syslog logging
+use_stderr disable
+use_syslog disable
 user_alarm_quota common
-verbose logging
-watch_log_file logging
+verbose disable
+watch_log_file disable
 zmq_target_expire zeromq
 api/host api
 api/paste_config api
diff --git a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
index c03cb4fb58..5d26cc41be 100644
--- a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
+++ b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
@@ -4,13 +4,13 @@ ceilometer_control_exchange exchange
 cinder_control_exchange exchange
 control_exchange amqp
 database_connection common
-debug logging
-default_log_levels logging
+debug disable
+default_log_levels disable
 dns_control_exchange exchange
 event_dispatchers dispatchers
 event_pipeline_cfg_file api
 executor_thread_pool_size common
-fatal_deprecations logging
+fatal_deprecations disable
 glance_control_exchange exchange
 glance_page_size glance
 heat_control_exchange exchange
@@ -18,21 +18,21 @@ host common
 http_control_exchanges exchange
 http_timeout common
 hypervisor_inspector inspector
-instance_format logging
-instance_uuid_format logging
+instance_format disable
+instance_uuid_format disable
 ironic_exchange exchange
 keystone_control_exchange exchange
 libvirt_type inspector
 libvirt_uri inspector
-log_config_append logging
-log_date_format logging
-log_dir logging
-log_file logging
-logging_context_format_string logging
-logging_debug_format_suffix logging
-logging_default_format_string logging
-logging_exception_prefix logging
-logging_user_identity_format logging
+log_config_append disable
+log_date_format disable
+log_dir disable
+log_file disable
+logging_context_format_string disable
+logging_debug_format_suffix disable
+logging_default_format_string disable
+logging_exception_prefix disable
+logging_user_identity_format disable
 magnum_control_exchange exchange
 memcached_servers common
 meter_dispatchers dispatchers
@@ -43,7 +43,7 @@ pipeline_cfg_file api
 pipeline_polling_interval api
 polling_namespaces common
 pollster_list common
-publish_errors logging
+publish_errors disable
 refresh_event_pipeline_cfg api
 refresh_pipeline_cfg api
 reseller_prefix swift
@@ -71,14 +71,14 @@ sample_source exchange
 shuffle_time_before_polling_task common
 sql_expire_samples_only common
 swift_control_exchange exchange
-syslog_log_facility logging
+syslog_log_facility disable
 transport_url amqp
 trove_control_exchange exchange
 use_pub_sub zeromq
-use_stderr logging
-use_syslog logging
-verbose logging
-watch_log_file logging
+use_stderr disable
+use_syslog disable
+verbose disable
+watch_log_file disable
 zaqar_control_exchange zaqar
 zmq_target_expire zeromq
 api/aodh_is_enabled api
diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings
index 6d6b7cc02b..0b326e1922 100644
--- a/tools/autogenerate-config-flagmappings/cinder.flagmappings
+++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings
@@ -109,9 +109,9 @@ datera_503_interval datera
 datera_acl_allow_all datera
 datera_debug datera
 db_driver disable
-debug logging
+debug disable
 default_availability_zone common
-default_log_levels logging
+default_log_levels disable
 default_timeout api
 default_volume_type common
 dell_sc_api_port dellsc
@@ -161,8 +161,8 @@ eqlx_use_chap eqlx
 executor_thread_pool_size common
 expiry_thres_minutes netapp_7mode_nfs netapp_cdot_nfs
 extra_capabilities api
-fatal_deprecations logging
-fatal_exception_format_errors logging
+fatal_deprecations disable
+fatal_exception_format_errors common
 filter_function scheduler
 flashsystem_connection_protocol flashsystem
 flashsystem_iscsi_portid flashsystem
@@ -280,8 +280,8 @@ infortrend_slots_b_channels_id infortrend
 infortrend_tiering infortrend
 initiator_auto_deregistration emc
 initiator_auto_registration emc
-instance_format logging
-instance_uuid_format logging
+instance_format disable
+instance_uuid_format disable
 io_port_list emc
 iscsi_helper storage
 iscsi_initiators emc
@@ -309,15 +309,15 @@ lenovo_backend_type lenovo
 lenovo_iscsi_ips lenovo
 lenovo_verify_certificate lenovo
 lenovo_verify_certificate_path lenovo
-log_config_append logging
-log_date_format logging
-log_dir logging
-log_file logging
-logging_context_format_string logging
-logging_debug_format_suffix logging
-logging_default_format_string logging
-logging_exception_prefix logging
-logging_user_identity_format logging
+log_config_append disable
+log_date_format disable
+log_dir disable
+log_file disable
+logging_context_format_string disable
+logging_debug_format_suffix disable
+logging_default_format_string disable
+logging_exception_prefix disable
+logging_user_identity_format disable
 lvm_conf_file lvm
 lvm_max_over_subscription_ratio lvm
 lvm_mirrors lvm
@@ -426,7 +426,7 @@ per_volume_size_limit api
 periodic_fuzzy_delay common
 periodic_interval common
 public_endpoint api
-publish_errors logging
+publish_errors disable
 pure_api_token pure
 pure_automatic_max_oversubscription_ratio pure
 pure_eradicate_on_delete pure
@@ -570,7 +570,7 @@ storwize_svc_volpool_name storwize
 strict_ssh_host_key_policy common
 suppress_requests_ssl_warnings common
 swift_catalog_info backups_swift
-syslog_log_facility logging
+syslog_log_facility disable
 tcp_keepalive common
 tcp_keepalive_count common
 tcp_keepalive_interval common
@@ -592,9 +592,9 @@ use_default_quota_class quota
 use_forwarded_for common
 use_multipath_for_image_xfer images
 use_pub_sub zeromq
-use_stderr logging
-use_syslog logging
-verbose logging
+use_stderr disable
+use_syslog disable
+verbose disable
 violin_request_timeout violin
 vmware_api_retry_count vmware
 vmware_ca_file vmware
@@ -636,7 +636,7 @@ vzstorage_mount_point_base vzstorage
 vzstorage_shares_config vzstorage
 vzstorage_sparsed_volumes vzstorage
 vzstorage_used_ratio vzstorage
-watch_log_file common
+watch_log_file disable
 windows_iscsi_lun_path windows
 xiv_chap xiv
 xiv_ds8k_connection_type xiv
diff --git a/tools/autogenerate-config-flagmappings/glance.flagmappings b/tools/autogenerate-config-flagmappings/glance.flagmappings
index 2074bceccd..36e8e570b3 100644
--- a/tools/autogenerate-config-flagmappings/glance.flagmappings
+++ b/tools/autogenerate-config-flagmappings/glance.flagmappings
@@ -21,8 +21,8 @@ client_socket_timeout api
 command replicator
 control_exchange amqp
 data_api common
-debug logging
-default_log_levels logging
+debug disable
+default_log_levels disable
 default_publisher_id amqp
 default_swift_reference swift
 delayed_delete imagecache
@@ -34,7 +34,7 @@ enable_v1_registry api
 enable_v2_api api
 enable_v2_registry api
 executor_thread_pool_size common
-fatal_deprecations logging
+fatal_deprecations disable
 http_keepalive api
 image_cache_dir imagecache
 image_cache_driver imagecache
@@ -46,21 +46,21 @@ image_member_quota common
 image_property_quota common
 image_size_cap api
 image_tag_quota common
-instance_format logging
-instance_uuid_format logging
+instance_format disable
+instance_uuid_format disable
 key_file ca
 limit_param_default common
 load_enabled api
 location_strategy api
-log_config_append logging
-log_date_format logging
-log_dir logging
-log_file logging
-logging_context_format_string logging
-logging_debug_format_suffix logging
-logging_default_format_string logging
-logging_exception_prefix logging
-logging_user_identity_format logging
+log_config_append disable
+log_date_format disable
+log_dir disable
+log_file disable
+logging_context_format_string disable
+logging_debug_format_suffix disable
+logging_default_format_string disable
+logging_exception_prefix disable
+logging_user_identity_format disable
 mastertoken replicator
 max_header_line api
 max_request_id_length api
@@ -72,7 +72,7 @@ owner_is_tenant api
 property_protection_file common
 property_protection_rule_format common
 public_endpoint api
-publish_errors logging
+publish_errors disable
 pydev_worker_debug_host testing
 pydev_worker_debug_port testing
 registry_client_ca_file registry
@@ -109,18 +109,18 @@ swift_store_auth_address swift
 swift_store_config_file swift
 swift_store_key swift
 swift_store_user swift
-syslog_log_facility logging
+syslog_log_facility disable
 tcp_keepidle api
 token replicator
 transport_url amqp
 use_pub_sub zeromq
-use_stderr logging
-use_syslog logging
+use_stderr disable
+use_syslog disable
 use_user_token api
 user_storage_quota common
-verbose logging
+verbose disable
 wakeup_time scrubber
-watch_log_file logging
+watch_log_file disable
 workers common
 zmq_target_expire zeromq
 cors/allow_credentials disable
diff --git a/tools/autogenerate-config-flagmappings/heat.flagmappings b/tools/autogenerate-config-flagmappings/heat.flagmappings
index 2bcf4e718d..9a52a672dd 100644
--- a/tools/autogenerate-config-flagmappings/heat.flagmappings
+++ b/tools/autogenerate-config-flagmappings/heat.flagmappings
@@ -4,9 +4,9 @@ client_retry_limit common
 cloud_backend clients_backends
 control_exchange amqp
 convergence_engine common
-debug logging
+debug disable
 default_deployment_signal_transport common
-default_log_levels logging
+default_log_levels disable
 default_notification_level amqp
 default_publisher_id amqp
 default_software_config_transport common
@@ -20,7 +20,7 @@ environment_dir common
 error_wait_time common
 event_purge_batch_size common
 executor_thread_pool_size common
-fatal_deprecations logging
+fatal_deprecations disable
 heat_metadata_server_url api metadata_api
 heat_stack_user_role api
 heat_waitcondition_server_url api waitcondition_api
@@ -29,19 +29,19 @@ hidden_stack_tags api
 host common
 instance_connection_https_validate_certificates cfn_api
 instance_connection_is_secure cfn_api
-instance_format logging
-instance_uuid_format logging
+instance_format disable
+instance_uuid_format disable
 keystone_backend common
 loadbalancer_template loadbalancer
-log_config_append logging
-log_date_format logging
-log_dir logging
-log_file logging
-logging_context_format_string logging
-logging_debug_format_suffix logging
-logging_default_format_string logging
-logging_exception_prefix logging
-logging_user_identity_format logging
+log_config_append disable
+log_date_format disable
+log_dir disable
+log_file disable
+logging_context_format_string disable
+logging_debug_format_suffix disable
+logging_default_format_string disable
+logging_exception_prefix disable
+logging_user_identity_format disable
 max_events_per_stack quota
 max_interface_check_attempts common
 max_json_body_size api
@@ -55,7 +55,7 @@ observe_on_update api
 onready notification
 periodic_interval common
 plugin_dirs common
-publish_errors logging
+publish_errors disable
 reauthentication_auth_method common
 region_name_for_services clients
 rpc_backend rpc
@@ -80,14 +80,14 @@ stack_scheduler_hints api
 stack_user_domain_id api
 stack_user_domain_name api
 stale_token_duration api
-syslog_log_facility logging
+syslog_log_facility disable
 transport_url amqp
 trusts_delegated_roles api
 use_pub_sub zeromq
-use_stderr logging
-use_syslog logging
-verbose logging
-watch_log_file common
+use_stderr disable
+use_syslog disable
+verbose disable
+watch_log_file disable
 zmq_target_expire zeromq
 auth_password/allowed_auth_uris api
 auth_password/multi_cloud api
diff --git a/tools/autogenerate-config-flagmappings/ironic.flagmappings b/tools/autogenerate-config-flagmappings/ironic.flagmappings
index d712ee1995..c8e6eda41f 100644
--- a/tools/autogenerate-config-flagmappings/ironic.flagmappings
+++ b/tools/autogenerate-config-flagmappings/ironic.flagmappings
@@ -1,38 +1,38 @@
 auth_strategy auth
 bindir common
 control_exchange amqp
-debug logging
-debug_tracebacks_in_api logging
-default_log_levels logging
+debug disable
+debug_tracebacks_in_api common
+default_log_levels disable
 enabled_drivers common
 executor_thread_pool_size common
-fatal_deprecations common
-fatal_exception_format_errors logging
+fatal_deprecations disable
+fatal_exception_format_errors common
 force_raw_images common
 grub_config_template common
 hash_distribution_replicas common
 hash_partition_exponent common
 hash_ring_reset_interval common
 host common
-instance_format logging
-instance_uuid_format logging
+instance_format disable
+instance_uuid_format disable
 isolinux_bin common
 isolinux_config_template common
-log_config_append logging
-log_date_format logging
-log_dir logging
-log_file logging
-logging_context_format_string logging
-logging_debug_format_suffix logging
-logging_default_format_string logging
-logging_exception_prefix logging
-logging_user_identity_format logging
+log_config_append disable
+log_date_format disable
+log_dir disable
+log_file disable
+logging_context_format_string disable
+logging_debug_format_suffix disable
+logging_default_format_string disable
+logging_exception_prefix disable
+logging_user_identity_format disable
 memcached_servers common
 my_ip common
 parallel_image_downloads common
 pecan_debug debug
 periodic_interval common
-publish_errors logging
+publish_errors disable
 pybasedir common
 rootwrap_config common
 rpc_backend rpc
@@ -51,14 +51,14 @@ rpc_zmq_max_port zeromq
 rpc_zmq_min_port zeromq
 rpc_zmq_topic_backlog zeromq
 state_path common
-syslog_log_facility logging
+syslog_log_facility disable
 tempdir common
 transport_url amqp
 use_pub_sub zeromq
-use_stderr logging
-use_syslog logging
-verbose logging
-watch_log_file logging
+use_stderr disable
+use_syslog disable
+verbose disable
+watch_log_file disable
 zmq_target_expire zeromq
 agent/agent_api_version agent
 agent/agent_pxe_append_params agent
diff --git a/tools/autogenerate-config-flagmappings/keystone.flagmappings b/tools/autogenerate-config-flagmappings/keystone.flagmappings
index 5cef161892..7d2a2fe767 100644
--- a/tools/autogenerate-config-flagmappings/keystone.flagmappings
+++ b/tools/autogenerate-config-flagmappings/keystone.flagmappings
@@ -2,25 +2,25 @@ admin_endpoint api
 admin_token api
 control_exchange amqp
 crypt_strength security
-debug logging
-default_log_levels logging
+debug disable
+default_log_levels disable
 default_publisher_id amqp
 domain_id_immutable api
 executor_thread_pool_size common
-fatal_deprecations logging
-insecure_debug logging
-instance_format logging
-instance_uuid_format logging
+fatal_deprecations disable
+insecure_debug common
+instance_format disable
+instance_uuid_format disable
 list_limit api
-log_config_append logging
-log_date_format logging
-log_dir logging
-log_file logging
-logging_context_format_string logging
-logging_debug_format_suffix logging
-logging_default_format_string logging
-logging_exception_prefix logging
-logging_user_identity_format logging
+log_config_append disable
+log_date_format disable
+log_dir disable
+log_file disable
+logging_context_format_string disable
+logging_debug_format_suffix disable
+logging_default_format_string disable
+logging_exception_prefix disable
+logging_user_identity_format disable
 max_param_size api
 max_project_tree_depth api
 max_token_size api
@@ -30,7 +30,7 @@ memcached_servers common
 notification_format amqp
 notification_opt_out amqp
 public_endpoint api
-publish_errors logging
+publish_errors disable
 pydev_debug_host debug
 pydev_debug_port debug
 rpc_backend rpc
@@ -51,13 +51,13 @@ rpc_zmq_topic_backlog zeromq
 secure_proxy_ssl_header api
 standard_threads debug
 strict_password_check api
-syslog_log_facility logging
+syslog_log_facility disable
 transport_url amqp
 use_pub_sub zeromq
-use_stderr logging
-use_syslog logging
-verbose logging
-watch_log_file logging
+use_stderr disable
+use_syslog disable
+verbose disable
+watch_log_file disable
 zmq_target_expire zeromq
 assignment/driver assignment
 assignment/prohibited_implied_role assignment
diff --git a/tools/autogenerate-config-flagmappings/manila.flagmappings b/tools/autogenerate-config-flagmappings/manila.flagmappings
index 5e13bf054e..2aa26b0750 100644
--- a/tools/autogenerate-config-flagmappings/manila.flagmappings
+++ b/tools/autogenerate-config-flagmappings/manila.flagmappings
@@ -28,8 +28,8 @@ data_node_access_ip common
 data_topic common
 db_backend api
 db_driver disable
-debug logging
-default_log_levels logging
+debug disable
+default_log_levels disable
 default_share_type share
 delete_share_server_with_last_share share
 driver_handles_share_servers share generic
@@ -51,8 +51,8 @@ enable_v2_api api
 enabled_share_backends share
 enabled_share_protocols share
 executor_thread_pool_size share
-fatal_deprecations logging
-fatal_exception_format_errors logging
+fatal_deprecations disable
+fatal_exception_format_errors common
 ganesha_config_dir ganesha
 ganesha_config_path ganesha
 ganesha_db_path ganesha
@@ -105,19 +105,19 @@ hpe3par_san_ssh_port hpe3par
 hpe3par_share_ip_address hpe3par
 hpe3par_share_mount_path hpe3par
 hpe3par_username hpe3par
-instance_format logging
-instance_uuid_format logging
+instance_format disable
+instance_uuid_format disable
 interface_driver generic
 knfs_export_options gpfs
-log_config_append logging
-log_date_format logging
-log_dir logging
-log_file logging
-logging_context_format_string logging
-logging_debug_format_suffix logging
-logging_default_format_string logging
-logging_exception_prefix logging
-logging_user_identity_format logging
+log_config_append disable
+log_date_format disable
+log_dir disable
+log_file disable
+logging_context_format_string disable
+logging_debug_format_suffix disable
+logging_default_format_string disable
+logging_exception_prefix disable
+logging_user_identity_format disable
 lvm_share_export_ip lvm
 lvm_share_export_root lvm
 lvm_share_helpers lvm
@@ -181,7 +181,7 @@ periodic_fuzzy_delay common
 periodic_hooks_interval common
 periodic_interval common
 pool_weight_multiplier scheduler
-publish_errors logging
+publish_errors disable
 quobyte_api_ca quobyte
 quobyte_api_password quobyte
 quobyte_api_url quobyte
@@ -268,7 +268,7 @@ state_path common
 storage_availability_zone common
 suppress_post_hooks_errors share
 suppress_pre_hooks_errors share
-syslog_log_facility logging
+syslog_log_facility disable
 tcp_keepalive common
 tcp_keepalive_count common
 tcp_keepalive_interval common
@@ -285,13 +285,13 @@ unused_share_server_cleanup_interval share
 use_forwarded_for common
 use_pub_sub zeromq
 use_scheduler_creating_share_from_snapshot share
-use_stderr logging
-use_syslog logging
-verbose logging
+use_stderr disable
+use_syslog disable
+verbose disable
 volume_api_class api
 volume_name_template api generic
 volume_snapshot_name_template api generic
-watch_log_file logging
+watch_log_file disable
 winrm_cert_key_pem_path winrm
 winrm_cert_pem_path winrm
 winrm_conn_timeout winrm
diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings
index ec36638863..0652d2c1b7 100644
--- a/tools/autogenerate-config-flagmappings/neutron.flagmappings
+++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings
@@ -20,11 +20,11 @@ bind_port common
 client_socket_timeout api
 control_exchange amqp
 core_plugin common
-debug logging lbaas_agent
+debug lbaas_agent
 default_availability_zones common
 default_ipv4_subnet_pool common
 default_ipv6_subnet_pool common
-default_log_levels logging
+default_log_levels disable
 device_driver lbaas_agent
 dhcp_agent_notification common
 dhcp_agents_per_network common
@@ -53,7 +53,7 @@ external_dns_driver common
 external_ingress_mark l3_agent
 external_network_bridge l3_agent
 external_pids agent
-fatal_deprecations logging
+fatal_deprecations disable
 force_metadata dhcp_agent
 gateway_external_network_id l3_agent
 global_physnet_mtu common
@@ -63,8 +63,8 @@ ha_vrrp_auth_password l3_agent
 ha_vrrp_auth_type l3_agent
 handle_internal_only_routers l3_agent
 host l3_agent dhcp_agent
-instance_format logging
-instance_uuid_format logging
+instance_format disable
+instance_uuid_format disable
 interface_driver l3_agent dhcp_agent lbaas_agent
 ip_lib_force_root common
 ipam_driver common
@@ -76,15 +76,15 @@ l3_ha_network_physical_name l3_agent
 l3_ha_network_type l3_agent
 loadbalancer_pool_scheduler_driver lbaas_services
 loadbalancer_scheduler_driver lbaas_services
-log_config_append logging
-log_date_format logging
-log_dir logging
-log_file logging
-logging_context_format_string logging
-logging_debug_format_suffix logging
-logging_default_format_string logging
-logging_exception_prefix logging
-logging_user_identity_format logging
+log_config_append disable
+log_date_format disable
+log_dir disable
+log_file disable
+logging_context_format_string disable
+logging_debug_format_suffix disable
+logging_default_format_string disable
+logging_exception_prefix disable
+logging_user_identity_format disable
 mac_generation_retries common
 max_allowed_address_pair common
 max_dns_nameservers common
@@ -129,7 +129,7 @@ pd_dhcp_driver pd_linux_agent
 periodic_fuzzy_delay common
 periodic_interval common lbaas_agent
 prefix_delegation_driver agent
-publish_errors logging
+publish_errors disable
 ra_confs ipv6_ra
 report_interval common
 resync_interval dhcp_agent
@@ -158,21 +158,21 @@ send_arp_for_ha l3_agent
 send_events_interval compute
 service_plugins api
 state_path common
-syslog_log_facility logging
+syslog_log_facility disable
 tcp_keepidle api
 transport_url amqp
 use_pub_sub zeromq
-use_ssl logging
-use_stderr logging
-use_syslog logging
+use_ssl api
+use_stderr disable
+use_syslog disable
 vendor_pen pd_linux_agent
-verbose logging
+verbose disable
 vlan_transparent common
-watch_log_file logging
+watch_log_file disable
 web_framework common
 wsgi_default_pool_size api
 wsgi_keep_alive api
-wsgi_log_format logging
+wsgi_log_format api
 zmq_target_expire zeromq
 AGENT/agent_type agent
 AGENT/arp_responder openvswitch_agent
@@ -477,7 +477,7 @@ oslo_middleware/secure_proxy_ssl_header api
 oslo_policy/policy_default_rule disable
 oslo_policy/policy_dirs disable
 oslo_policy/policy_file disable
-oslo_versionedobjects/fatal_exception_format_errors logging
+oslo_versionedobjects/fatal_exception_format_errors api
 pluto/shutdown_check_back_off vpnaas_ipsec
 pluto/shutdown_check_retries vpnaas_ipsec
 pluto/shutdown_check_timeout vpnaas_ipsec
diff --git a/tools/autogenerate-config-flagmappings/nova.flagmappings b/tools/autogenerate-config-flagmappings/nova.flagmappings
index 42ec0cf122..4d01fde257 100644
--- a/tools/autogenerate-config-flagmappings/nova.flagmappings
+++ b/tools/autogenerate-config-flagmappings/nova.flagmappings
@@ -47,13 +47,13 @@ create_unique_mac_address_attempts network
 crl_file ca
 daemon vnc
 db_driver disable
-debug logging
+debug disable
 default_access_ip_network_name network
 default_availability_zone availabilityzones
 default_ephemeral_format hypervisor
 default_flavor compute
 default_floating_pool network
-default_log_levels logging
+default_log_levels disable
 default_notification_level compute
 default_publisher_id amqp
 default_schedule_zone availabilityzones
@@ -80,8 +80,8 @@ enabled_ssl_apis api
 executor_thread_pool_size common
 fake_call testing
 fake_network testing
-fatal_deprecations logging
-fatal_exception_format_errors logging
+fatal_deprecations disable
+fatal_exception_format_errors common
 firewall_driver network
 fixed_ip_disassociate_timeout network
 fixed_range_v6 ipv6
@@ -108,11 +108,11 @@ instance_build_timeout compute
 instance_delete_interval compute
 instance_dns_domain network
 instance_dns_manager network
-instance_format logging
+instance_format disable
 instance_name_template api
 instance_usage_audit compute
 instance_usage_audit_period compute
-instance_uuid_format logging
+instance_uuid_format disable
 instances_path compute
 internal_service_availability_zone availabilityzones
 io_ops_weight_multiplier scheduler
@@ -139,15 +139,15 @@ ldap_dns_user ldap
 linuxnet_interface_driver network
 linuxnet_ovs_integration_bridge network
 live_migration_retry_count livemigration
-log_config_append logging
-log_date_format logging
-log_dir logging
-log_file logging
-logging_context_format_string logging
-logging_debug_format_suffix logging
-logging_default_format_string logging
-logging_exception_prefix logging
-logging_user_identity_format logging
+log_config_append disable
+log_date_format disable
+log_dir disable
+log_file disable
+logging_context_format_string disable
+logging_debug_format_suffix disable
+logging_default_format_string disable
+logging_exception_prefix disable
+logging_user_identity_format disable
 max_age policy
 max_concurrent_builds compute
 max_concurrent_live_migrations livemigration
@@ -205,7 +205,7 @@ periodic_fuzzy_delay periodic
 preallocate_images hypervisor
 project_cert_subject ca
 public_interface network
-publish_errors logging
+publish_errors disable
 pybasedir common
 quota_cores quota
 quota_driver quota
@@ -296,7 +296,7 @@ ssl_only vnc
 state_path common
 stub_compute xen
 sync_power_state_interval compute
-syslog_log_facility logging
+syslog_log_facility disable
 teardown_unused_network_gateway network
 tempdir common
 timeout_nbd hypervisor
@@ -314,13 +314,13 @@ use_project_ca ca
 use_pub_sub zeromq
 use_rootwrap_daemon common
 use_single_default_gateway network
-use_stderr logging
-use_syslog logging
+use_stderr disable
+use_syslog disable
 user_cert_subject ca
 vcpu_pin_set hypervisor
 vendordata_driver metadata
 vendordata_jsonfile_path metadata
-verbose logging
+verbose disable
 vif_plugging_is_fatal compute
 vif_plugging_timeout compute
 virt_mkfs hypervisor
@@ -333,7 +333,7 @@ vpn_image_id vpn
 vpn_ip vpn
 vpn_key_suffix vpn
 vpn_start vpn
-watch_log_file logging
+watch_log_file disable
 web vnc
 zmq_target_expire zeromq
 api_database/connection api_database
diff --git a/tools/autogenerate-config-flagmappings/octavia.flagmappings b/tools/autogenerate-config-flagmappings/octavia.flagmappings
index 9b341cb219..3ebfd25655 100644
--- a/tools/autogenerate-config-flagmappings/octavia.flagmappings
+++ b/tools/autogenerate-config-flagmappings/octavia.flagmappings
@@ -8,26 +8,26 @@ auth_strategy common
 bind_host common
 bind_port common
 control_exchange common
-debug common
-default_log_levels common
+debug disable
+default_log_levels disable
 executor_thread_pool_size common
-fatal_deprecations common
+fatal_deprecations disable
 host common
-instance_format logging
-instance_uuid_format logging
-log_config_append logging
-log_date_format logging
-log_dir logging
-log_file logging
-logging_context_format_string logging
-logging_debug_format_suffix logging
-logging_default_format_string logging
-logging_exception_prefix logging
-logging_user_identity_format logging
+instance_format disable
+instance_uuid_format disable
+log_config_append disable
+log_date_format disable
+log_dir disable
+log_file disable
+logging_context_format_string disable
+logging_debug_format_suffix disable
+logging_default_format_string disable
+logging_exception_prefix disable
+logging_user_identity_format disable
 memcached_servers cache
 octavia_plugins common
 pagination_max_limit api
-publish_errors logging
+publish_errors disable
 rpc_backend zeromq
 rpc_cast_timeout zeromq
 rpc_conn_pool_size zeromq
@@ -43,13 +43,13 @@ rpc_zmq_matchmaker zeromq
 rpc_zmq_max_port zeromq
 rpc_zmq_min_port zeromq
 rpc_zmq_topic_backlog zeromq
-syslog_log_facility logging
+syslog_log_facility disable
 transport_url rpc
 use_pub_sub zeromq
-use_stderr logging
-use_syslog logging
-verbose logging
-watch_log_file logging
+use_stderr disable
+use_syslog disable
+verbose disable
+watch_log_file disable
 zmq_target_expire zeromq
 amphora_agent/agent_server_ca common
 amphora_agent/agent_server_cert common
diff --git a/tools/autogenerate-config-flagmappings/sahara.flagmappings b/tools/autogenerate-config-flagmappings/sahara.flagmappings
index cc01946d8b..1205c2128e 100644
--- a/tools/autogenerate-config-flagmappings/sahara.flagmappings
+++ b/tools/autogenerate-config-flagmappings/sahara.flagmappings
@@ -7,33 +7,33 @@ compute_topology_file common
 control_exchange amqp
 coordinator_heartbeat_interval common
 db_driver disable
-debug logging
-default_log_levels logging
+debug disable
+default_log_levels disable
 default_ntp_server common
 disable_event_log common
 enable_data_locality common
 enable_hypervisor_awareness common
 executor_thread_pool_size common
-fatal_deprecations logging
+fatal_deprecations disable
 global_remote_threshold common
 hash_ring_replicas_count common
 heat_enable_wait_condition common
 heat_stack_tags common
 infrastructure_engine common
-instance_format logging
-instance_uuid_format logging
+instance_format disable
+instance_uuid_format disable
 job_binary_max_KB common
 job_canceling_timeout common
 job_workflow_postfix common
-log_config_append logging
-log_date_format logging
-log_dir logging
-log_file logging
-logging_context_format_string logging
-logging_debug_format_suffix logging
-logging_default_format_string logging
-logging_exception_prefix logging
-logging_user_identity_format logging
+log_config_append disable
+log_date_format disable
+log_dir disable
+log_file disable
+logging_context_format_string disable
+logging_debug_format_suffix disable
+logging_default_format_string disable
+logging_exception_prefix disable
+logging_user_identity_format disable
 memcached_servers common
 min_transient_cluster_active_time common
 node_domain common
@@ -47,7 +47,7 @@ plugins common
 proxy_command common
 proxy_user_domain_name domain
 proxy_user_role_names domain
-publish_errors logging
+publish_errors disable
 remote common
 rootwrap_command common
 rpc_backend rpc
@@ -69,7 +69,7 @@ ssh_timeout_common ssh
 ssh_timeout_files ssh
 ssh_timeout_interactive ssh
 swift_topology_file common
-syslog_log_facility logging
+syslog_log_facility disable
 transport_url amqp
 use_barbican_key_manager common
 use_domain_for_proxy_users domain
@@ -79,10 +79,10 @@ use_namespaces common
 use_neutron common
 use_pub_sub zeromq
 use_rootwrap common
-use_stderr logging
-use_syslog logging
-verbose logging
-watch_log_file logging
+use_stderr disable
+use_syslog disable
+verbose disable
+watch_log_file disable
 zmq_target_expire zeromq
 castellan/barbican_api_endpoint common
 castellan/barbican_api_version common
diff --git a/tools/autogenerate-config-flagmappings/trove.flagmappings b/tools/autogenerate-config-flagmappings/trove.flagmappings
index c7a1c66efd..368fe09f93 100644
--- a/tools/autogenerate-config-flagmappings/trove.flagmappings
+++ b/tools/autogenerate-config-flagmappings/trove.flagmappings
@@ -36,9 +36,9 @@ databases_page_size common
 datastore_manager taskmanager
 datastore_registry_ext taskmanager
 db_api_implementation api
-debug logging
+debug disable
 default_datastore common
-default_log_levels logging
+default_log_levels disable
 default_neutron_networks common
 default_password_length common
 device_path volume
@@ -61,8 +61,8 @@ executor_thread_pool_size common
 exists_notification_interval taskmanager
 exists_notification_transformer taskmanager
 expected_filetype_suffixes common
-fatal_deprecations logging
-format_options logging
+fatal_deprecations disable
+format_options common
 guest_config guestagent
 guest_id guestagent
 guest_info guestagent
@@ -81,19 +81,19 @@ http_mgmt_post_rate api
 http_post_rate api
 http_put_rate api
 injected_config_location api
-instance_format logging
-instance_uuid_format logging
+instance_format disable
+instance_uuid_format disable
 instances_page_size api
 ip_regex compute
-log_config_append logging
-log_date_format logging
-log_dir logging
-log_file logging
-logging_context_format_string logging
-logging_debug_format_suffix logging
-logging_default_format_string logging
-logging_exception_prefix logging
-logging_user_identity_format logging
+log_config_append disable
+log_date_format disable
+log_dir disable
+log_file disable
+logging_context_format_string disable
+logging_debug_format_suffix disable
+logging_default_format_string disable
+logging_exception_prefix disable
+logging_user_identity_format disable
 max_accepted_volume_size quota
 max_backups_per_tenant quota
 max_header_line api
@@ -105,7 +105,7 @@ module_types common
 modules_page_size common
 mount_options guestagent
 network_driver network
-network_label_regex logging
+network_label_regex common
 neutron_endpoint_type network
 neutron_service_type network
 neutron_url network
@@ -120,7 +120,7 @@ nova_proxy_admin_tenant_name nova
 nova_proxy_admin_user nova
 num_tries rpc
 os_region_name api
-publish_errors logging
+publish_errors disable
 pybasedir common
 pydev_debug debug
 pydev_debug_host debug
@@ -167,7 +167,7 @@ storage_strategy guestagent
 swift_endpoint_type swift
 swift_service_type swift
 swift_url swift
-syslog_log_facility logging
+syslog_log_facility disable
 taskmanager_queue common
 tcp_keepidle api
 template_path common
@@ -188,15 +188,15 @@ use_heat taskmanager
 use_nova_server_config_drive taskmanager
 use_nova_server_volume taskmanager
 use_pub_sub zeromq
-use_stderr logging
-use_syslog logging
+use_stderr disable
+use_syslog disable
 users_page_size api
-verbose logging
+verbose disable
 verify_swift_checksum_on_restore taskmanager
 volume_format_timeout volume
 volume_fstype volume
 volume_time_out volume
-watch_log_file logging
+watch_log_file disable
 zmq_target_expire zeromq
 cassandra/api_strategy db_cassandra
 cassandra/backup_incremental_strategy db_cassandra
diff --git a/tools/autogenerate-config-flagmappings/zaqar.flagmappings b/tools/autogenerate-config-flagmappings/zaqar.flagmappings
index 2f96491682..3a7c4d8bbc 100644
--- a/tools/autogenerate-config-flagmappings/zaqar.flagmappings
+++ b/tools/autogenerate-config-flagmappings/zaqar.flagmappings
@@ -1,29 +1,29 @@
 admin_mode api
 auth_strategy authentication
 daemon api
-debug logging
-default_log_levels logging
-fatal_deprecations logging
-instance_format logging
-instance_uuid_format logging
-log_config_append logging
-log_date_format logging
-log_dir logging
-log_file logging
-logging_context_format_string logging
-logging_debug_format_suffix logging
-logging_default_format_string logging
-logging_exception_prefix logging
-logging_user_identity_format logging
+debug disable
+default_log_levels disable
+fatal_deprecations disable
+instance_format disable
+instance_uuid_format disable
+log_config_append disable
+log_date_format disable
+log_dir disable
+log_file disable
+logging_context_format_string disable
+logging_debug_format_suffix disable
+logging_default_format_string disable
+logging_exception_prefix disable
+logging_user_identity_format disable
 memcached_servers cache
 pooling pooling
-publish_errors logging
-syslog_log_facility logging
+publish_errors disable
+syslog_log_facility disable
 unreliable api
-use_stderr logging
-use_syslog logging
-verbose logging
-watch_log_file logging
+use_stderr disable
+use_syslog disable
+verbose disable
+watch_log_file disable
 cache/backend disable
 cache/backend_argument disable
 cache/config_prefix disable