diff --git a/doc/config-reference/source/bare-metal.rst b/doc/config-reference/source/bare-metal.rst
index 6aa4648ac6..fa44379f6e 100644
--- a/doc/config-reference/source/bare-metal.rst
+++ b/doc/config-reference/source/bare-metal.rst
@@ -38,7 +38,6 @@ service configuration options.
.. include:: tables/ironic-keystone.rst
.. include:: tables/ironic-logging.rst
.. include:: tables/ironic-neutron.rst
-.. include:: tables/ironic-policy.rst
.. include:: tables/ironic-pxe.rst
.. include:: tables/ironic-redis.rst
.. include:: tables/ironic-rpc.rst
diff --git a/doc/config-reference/source/common-configurations.rst b/doc/config-reference/source/common-configurations.rst
index 3aa893c022..0532532891 100644
--- a/doc/config-reference/source/common-configurations.rst
+++ b/doc/config-reference/source/common-configurations.rst
@@ -15,5 +15,6 @@ for shared service and libraries.
common-configurations/auth.rst
common-configurations/database.rst
common-configurations/logging.rst
+ common-configurations/policy.rst
common-configurations/rpc.rst
common-configurations/cors.rst
diff --git a/doc/config-reference/source/common-configurations/policy.rst b/doc/config-reference/source/common-configurations/policy.rst
new file mode 100644
index 0000000000..4b3faace1d
--- /dev/null
+++ b/doc/config-reference/source/common-configurations/policy.rst
@@ -0,0 +1,8 @@
+=====================
+Policy configurations
+=====================
+
+The policy configuration options allow the deployer to control where
+the policy files are located and the default rule to apply when policy.
+
+.. include:: ../tables/common-policy.rst
diff --git a/doc/config-reference/source/data-processing-service.rst b/doc/config-reference/source/data-processing-service.rst
index f8d7122557..f0f623fdcf 100644
--- a/doc/config-reference/source/data-processing-service.rst
+++ b/doc/config-reference/source/data-processing-service.rst
@@ -26,7 +26,6 @@ service configuration options:
.. include:: tables/sahara-domain.rst
.. include:: tables/sahara-logging.rst
.. include:: tables/sahara-object_store_access.rst
-.. include:: tables/sahara-policy.rst
.. include:: tables/sahara-rabbitmq.rst
.. include:: tables/sahara-redis.rst
.. include:: tables/sahara-rpc.rst
diff --git a/doc/config-reference/source/image-service.rst b/doc/config-reference/source/image-service.rst
index b853a3bbf5..a7806b6883 100644
--- a/doc/config-reference/source/image-service.rst
+++ b/doc/config-reference/source/image-service.rst
@@ -32,7 +32,6 @@ a comprehensive list.
.. include:: tables/glance-common.rst
.. include:: tables/glance-imagecache.rst
.. include:: tables/glance-logging.rst
-.. include:: tables/glance-policy.rst
.. include:: tables/glance-profiler.rst
.. include:: tables/glance-redis.rst
.. include:: tables/glance-registry.rst
diff --git a/doc/config-reference/source/tables/ceilometer-policy.rst b/doc/config-reference/source/tables/ceilometer-policy.rst
deleted file mode 100644
index 1f5426d2ee..0000000000
--- a/doc/config-reference/source/tables/ceilometer-policy.rst
+++ /dev/null
@@ -1,26 +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-policy:
-
-.. list-table:: Description of policy configuration options
- :header-rows: 1
- :class: config-ref-table
-
- * - Configuration option = Default value
- - Description
- * - **[oslo_policy]**
- -
- * - ``policy_default_rule`` = ``default``
- - (String) Default rule. Enforced when a requested rule is not found.
- * - ``policy_dirs`` = ``['policy.d']``
- - (Multi-valued) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched. Missing or empty directories are ignored.
- * - ``policy_file`` = ``policy.json``
- - (String) The JSON file that defines policies.
diff --git a/doc/config-reference/source/tables/cinder-api.rst b/doc/config-reference/source/tables/cinder-api.rst
index 2574e0cdca..8e9f7e33a4 100644
--- a/doc/config-reference/source/tables/cinder-api.rst
+++ b/doc/config-reference/source/tables/cinder-api.rst
@@ -80,14 +80,6 @@
- (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_policy]**
- -
- * - ``policy_default_rule`` = ``default``
- - (String) Default rule. Enforced when a requested rule is not found.
- * - ``policy_dirs`` = ``['policy.d']``
- - (Multi-valued) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched. Missing or empty directories are ignored.
- * - ``policy_file`` = ``policy.json``
- - (String) The JSON file that defines policies.
* - **[oslo_versionedobjects]**
-
* - ``fatal_exception_format_errors`` = ``False``
diff --git a/doc/config-reference/source/tables/aodh-policy.rst b/doc/config-reference/source/tables/common-policy.rst
similarity index 100%
rename from doc/config-reference/source/tables/aodh-policy.rst
rename to doc/config-reference/source/tables/common-policy.rst
diff --git a/doc/config-reference/source/tables/glance-policy.rst b/doc/config-reference/source/tables/glance-policy.rst
deleted file mode 100644
index 7728ae258d..0000000000
--- a/doc/config-reference/source/tables/glance-policy.rst
+++ /dev/null
@@ -1,26 +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-policy:
-
-.. list-table:: Description of policy configuration options
- :header-rows: 1
- :class: config-ref-table
-
- * - Configuration option = Default value
- - Description
- * - **[oslo_policy]**
- -
- * - ``policy_default_rule`` = ``default``
- - (String) Default rule. Enforced when a requested rule is not found.
- * - ``policy_dirs`` = ``['policy.d']``
- - (Multi-valued) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched. Missing or empty directories are ignored.
- * - ``policy_file`` = ``policy.json``
- - (String) The JSON file that defines policies.
diff --git a/doc/config-reference/source/tables/heat-api.rst b/doc/config-reference/source/tables/heat-api.rst
index a12cf61549..4808ba5886 100644
--- a/doc/config-reference/source/tables/heat-api.rst
+++ b/doc/config-reference/source/tables/heat-api.rst
@@ -110,14 +110,6 @@
- (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_policy]**
- -
- * - ``policy_default_rule`` = ``default``
- - (String) Default rule. Enforced when a requested rule is not found.
- * - ``policy_dirs`` = ``['policy.d']``
- - (Multi-valued) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched. Missing or empty directories are ignored.
- * - ``policy_file`` = ``policy.json``
- - (String) The JSON file that defines policies.
* - **[oslo_versionedobjects]**
-
* - ``fatal_exception_format_errors`` = ``False``
diff --git a/doc/config-reference/source/tables/ironic-policy.rst b/doc/config-reference/source/tables/ironic-policy.rst
deleted file mode 100644
index 85b691503c..0000000000
--- a/doc/config-reference/source/tables/ironic-policy.rst
+++ /dev/null
@@ -1,26 +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-policy:
-
-.. list-table:: Description of policy configuration options
- :header-rows: 1
- :class: config-ref-table
-
- * - Configuration option = Default value
- - Description
- * - **[oslo_policy]**
- -
- * - ``policy_default_rule`` = ``default``
- - (String) Default rule. Enforced when a requested rule is not found.
- * - ``policy_dirs`` = ``['policy.d']``
- - (Multi-valued) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched. Missing or empty directories are ignored.
- * - ``policy_file`` = ``policy.json``
- - (String) The JSON file that defines policies.
diff --git a/doc/config-reference/source/tables/keystone-policy.rst b/doc/config-reference/source/tables/keystone-policy.rst
index 245df50c9d..e560a382a9 100644
--- a/doc/config-reference/source/tables/keystone-policy.rst
+++ b/doc/config-reference/source/tables/keystone-policy.rst
@@ -16,14 +16,6 @@
* - Configuration option = Default value
- Description
- * - **[oslo_policy]**
- -
- * - ``policy_default_rule`` = ``default``
- - (String) Default rule. Enforced when a requested rule is not found.
- * - ``policy_dirs`` = ``['policy.d']``
- - (Multi-valued) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched. Missing or empty directories are ignored.
- * - ``policy_file`` = ``policy.json``
- - (String) The JSON file that defines policies.
* - **[policy]**
-
* - ``driver`` = ``sql``
diff --git a/doc/config-reference/source/tables/manila-api.rst b/doc/config-reference/source/tables/manila-api.rst
index e3d51ea2b1..010fd9cb52 100644
--- a/doc/config-reference/source/tables/manila-api.rst
+++ b/doc/config-reference/source/tables/manila-api.rst
@@ -64,11 +64,3 @@
- (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_policy]**
- -
- * - ``policy_default_rule`` = ``default``
- - (String) Default rule. Enforced when a requested rule is not found.
- * - ``policy_dirs`` = ``['policy.d']``
- - (Multi-valued) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched. Missing or empty directories are ignored.
- * - ``policy_file`` = ``policy.json``
- - (String) The JSON file that defines policies.
diff --git a/doc/config-reference/source/tables/neutron-api.rst b/doc/config-reference/source/tables/neutron-api.rst
index b6e9c9d044..b06ea5a9d0 100644
--- a/doc/config-reference/source/tables/neutron-api.rst
+++ b/doc/config-reference/source/tables/neutron-api.rst
@@ -52,11 +52,3 @@
- (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_policy]**
- -
- * - ``policy_default_rule`` = ``default``
- - (String) Default rule. Enforced when a requested rule is not found.
- * - ``policy_dirs`` = ``['policy.d']``
- - (Multi-valued) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched. Missing or empty directories are ignored.
- * - ``policy_file`` = ``policy.json``
- - (String) The JSON file that defines policies.
diff --git a/doc/config-reference/source/tables/nova-policy.rst b/doc/config-reference/source/tables/nova-policy.rst
index c92bef4b20..31016b4b23 100644
--- a/doc/config-reference/source/tables/nova-policy.rst
+++ b/doc/config-reference/source/tables/nova-policy.rst
@@ -38,11 +38,3 @@
- (Boolean) Attempt to resize the filesystem by accessing the image over a block device. This is done by the host and may not be necessary if the image contains a recent version of cloud-init. Possible mechanisms require the nbd driver (for qcow and raw), or loop (for raw).
* - ``until_refresh`` = ``0``
- (Integer) Count of reservations until usage is refreshed. This defaults to 0(off) to avoid additional load but it is useful to turn on to help keep quota usage up to date and reduce the impact of out of sync usage issues.
- * - **[oslo_policy]**
- -
- * - ``policy_default_rule`` = ``default``
- - (String) Default rule. Enforced when a requested rule is not found.
- * - ``policy_dirs`` = ``['policy.d']``
- - (Multi-valued) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched. Missing or empty directories are ignored.
- * - ``policy_file`` = ``policy.json``
- - (String) The JSON file that defines policies.
diff --git a/doc/config-reference/source/tables/sahara-policy.rst b/doc/config-reference/source/tables/sahara-policy.rst
deleted file mode 100644
index 906dfb07f7..0000000000
--- a/doc/config-reference/source/tables/sahara-policy.rst
+++ /dev/null
@@ -1,26 +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-policy:
-
-.. list-table:: Description of policy configuration options
- :header-rows: 1
- :class: config-ref-table
-
- * - Configuration option = Default value
- - Description
- * - **[oslo_policy]**
- -
- * - ``policy_default_rule`` = ``default``
- - (String) Default rule. Enforced when a requested rule is not found.
- * - ``policy_dirs`` = ``['policy.d']``
- - (Multi-valued) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched. Missing or empty directories are ignored.
- * - ``policy_file`` = ``policy.json``
- - (String) The JSON file that defines policies.
diff --git a/doc/config-reference/source/tables/zaqar-api.rst b/doc/config-reference/source/tables/zaqar-api.rst
index 7e948fd038..4b53475ef7 100644
--- a/doc/config-reference/source/tables/zaqar-api.rst
+++ b/doc/config-reference/source/tables/zaqar-api.rst
@@ -34,14 +34,6 @@
-
* - ``smtp_command`` = ``/usr/sbin/sendmail -t -oi``
- (String) The command of smtp to send email. The format is "command_name arg1 arg2".
- * - **[oslo_policy]**
- -
- * - ``policy_default_rule`` = ``default``
- - (String) Default rule. Enforced when a requested rule is not found.
- * - ``policy_dirs`` = ``['policy.d']``
- - (Multi-valued) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched. Missing or empty directories are ignored.
- * - ``policy_file`` = ``policy.json``
- - (String) The JSON file that defines policies.
* - **[service_auth]**
-
* - ``admin_password`` = ``password``
diff --git a/doc/config-reference/source/telemetry/alarming_service_config_opts.rst b/doc/config-reference/source/telemetry/alarming_service_config_opts.rst
index 4f5d09975e..8f3cd9ab4b 100644
--- a/doc/config-reference/source/telemetry/alarming_service_config_opts.rst
+++ b/doc/config-reference/source/telemetry/alarming_service_config_opts.rst
@@ -11,7 +11,6 @@ Alarming service configuration options.
.. include:: ../tables/aodh-common.rst
.. include:: ../tables/aodh-coordination.rst
.. include:: ../tables/aodh-logging.rst
-.. include:: ../tables/aodh-policy.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_service_config_opts.rst b/doc/config-reference/source/telemetry/telemetry_service_config_opts.rst
index 3479686ba8..e1c7c2a1df 100644
--- a/doc/config-reference/source/telemetry/telemetry_service_config_opts.rst
+++ b/doc/config-reference/source/telemetry/telemetry_service_config_opts.rst
@@ -23,7 +23,6 @@ configuration options.
.. include:: ../tables/ceilometer-logging.rst
.. include:: ../tables/ceilometer-magnetodb.rst
.. include:: ../tables/ceilometer-notification.rst
-.. include:: ../tables/ceilometer-policy.rst
.. include:: ../tables/ceilometer-rabbitmq.rst
.. include:: ../tables/ceilometer-redis.rst
.. include:: ../tables/ceilometer-rgw.rst
diff --git a/tools/autogenerate-config-flagmappings/aodh.flagmappings b/tools/autogenerate-config-flagmappings/aodh.flagmappings
index 2be09cf99f..518e48c336 100644
--- a/tools/autogenerate-config-flagmappings/aodh.flagmappings
+++ b/tools/autogenerate-config-flagmappings/aodh.flagmappings
@@ -216,8 +216,8 @@ oslo_messaging_rabbit/ssl_options rpc
oslo_messaging_rabbit/tcp_user_timeout rpc
oslo_middleware/max_request_body_size api
oslo_middleware/secure_proxy_ssl_header api
-oslo_policy/policy_default_rule policy
-oslo_policy/policy_dirs policy
-oslo_policy/policy_file policy
+oslo_policy/policy_default_rule disable
+oslo_policy/policy_dirs disable
+oslo_policy/policy_file disable
service_credentials/interface common
service_credentials/region_name common
diff --git a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
index 705e7e7e79..cbb10bbc7c 100644
--- a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
+++ b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
@@ -292,9 +292,9 @@ oslo_messaging_rabbit/ssl_options rpc
oslo_messaging_rabbit/tcp_user_timeout rpc
oslo_middleware/max_request_body_size api
oslo_middleware/secure_proxy_ssl_header api
-oslo_policy/policy_default_rule policy
-oslo_policy/policy_dirs policy
-oslo_policy/policy_file policy
+oslo_policy/policy_default_rule disable
+oslo_policy/policy_dirs disable
+oslo_policy/policy_file disable
polling/partitioning_group_prefix common
publisher/telemetry_secret rpc
publisher_notifier/event_topic rpc
diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings
index e9d018818b..7540cd32a8 100644
--- a/tools/autogenerate-config-flagmappings/cinder.flagmappings
+++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings
@@ -868,9 +868,9 @@ oslo_messaging_rabbit/ssl_options rpc
oslo_messaging_rabbit/tcp_user_timeout rpc
oslo_middleware/max_request_body_size api
oslo_middleware/secure_proxy_ssl_header api
-oslo_policy/policy_default_rule api
-oslo_policy/policy_dirs api
-oslo_policy/policy_file api
+oslo_policy/policy_default_rule disable
+oslo_policy/policy_dirs disable
+oslo_policy/policy_file disable
oslo_versionedobjects/fatal_exception_format_errors api
profiler/enabled profiler
profiler/hmac_keys profiler
diff --git a/tools/autogenerate-config-flagmappings/glance.flagmappings b/tools/autogenerate-config-flagmappings/glance.flagmappings
index 65efb7ecf8..cab814de0c 100644
--- a/tools/autogenerate-config-flagmappings/glance.flagmappings
+++ b/tools/autogenerate-config-flagmappings/glance.flagmappings
@@ -358,9 +358,9 @@ oslo_messaging_rabbit/ssl_options rpc
oslo_messaging_rabbit/tcp_user_timeout rpc
oslo_middleware/max_request_body_size api
oslo_middleware/secure_proxy_ssl_header api
-oslo_policy/policy_default_rule policy
-oslo_policy/policy_dirs policy
-oslo_policy/policy_file policy
+oslo_policy/policy_default_rule disable
+oslo_policy/policy_dirs disable
+oslo_policy/policy_file disable
paste_deploy/config_file api
paste_deploy/flavor api
profiler/enabled profiler
diff --git a/tools/autogenerate-config-flagmappings/heat.flagmappings b/tools/autogenerate-config-flagmappings/heat.flagmappings
index 0a6cb21148..2f960f44ef 100644
--- a/tools/autogenerate-config-flagmappings/heat.flagmappings
+++ b/tools/autogenerate-config-flagmappings/heat.flagmappings
@@ -354,9 +354,9 @@ oslo_messaging_rabbit/ssl_options rabbitmq
oslo_messaging_rabbit/tcp_user_timeout rabbitmq
oslo_middleware/max_request_body_size api
oslo_middleware/secure_proxy_ssl_header api
-oslo_policy/policy_default_rule api
-oslo_policy/policy_dirs api
-oslo_policy/policy_file api
+oslo_policy/policy_default_rule disable
+oslo_policy/policy_dirs disable
+oslo_policy/policy_file disable
oslo_versionedobjects/fatal_exception_format_errors api
paste_deploy/api_paste_config api
paste_deploy/flavor api
diff --git a/tools/autogenerate-config-flagmappings/ironic.flagmappings b/tools/autogenerate-config-flagmappings/ironic.flagmappings
index d10a5df01c..27fbc97c54 100644
--- a/tools/autogenerate-config-flagmappings/ironic.flagmappings
+++ b/tools/autogenerate-config-flagmappings/ironic.flagmappings
@@ -346,9 +346,9 @@ oslo_messaging_rabbit/ssl_options rabbitmq
oslo_messaging_rabbit/tcp_user_timeout rabbitmq
oslo_middleware/max_request_body_size api
oslo_middleware/secure_proxy_ssl_header api
-oslo_policy/policy_default_rule policy
-oslo_policy/policy_dirs policy
-oslo_policy/policy_file policy
+oslo_policy/policy_default_rule disable
+oslo_policy/policy_dirs disable
+oslo_policy/policy_file disable
oslo_versionedobjects/fatal_exception_format_errors api
pxe/default_ephemeral_format pxe
pxe/disk_devices pxe
diff --git a/tools/autogenerate-config-flagmappings/keystone.flagmappings b/tools/autogenerate-config-flagmappings/keystone.flagmappings
index 6654b92d67..d4c2ad990d 100644
--- a/tools/autogenerate-config-flagmappings/keystone.flagmappings
+++ b/tools/autogenerate-config-flagmappings/keystone.flagmappings
@@ -357,9 +357,9 @@ oslo_messaging_rabbit/ssl_options rabbitmq
oslo_messaging_rabbit/tcp_user_timeout rabbitmq
oslo_middleware/max_request_body_size api
oslo_middleware/secure_proxy_ssl_header api
-oslo_policy/policy_default_rule policy
-oslo_policy/policy_dirs policy
-oslo_policy/policy_file policy
+oslo_policy/policy_default_rule disable
+oslo_policy/policy_dirs disable
+oslo_policy/policy_file disable
paste_deploy/config_file api
policy/driver policy
policy/list_limit policy
diff --git a/tools/autogenerate-config-flagmappings/manila.flagmappings b/tools/autogenerate-config-flagmappings/manila.flagmappings
index 09a0132446..5453921aa8 100644
--- a/tools/autogenerate-config-flagmappings/manila.flagmappings
+++ b/tools/autogenerate-config-flagmappings/manila.flagmappings
@@ -520,6 +520,6 @@ oslo_messaging_rabbit/ssl_options rabbitmq
oslo_messaging_rabbit/tcp_user_timeout rabbitmq
oslo_middleware/max_request_body_size api
oslo_middleware/secure_proxy_ssl_header api
-oslo_policy/policy_default_rule api
-oslo_policy/policy_dirs api
-oslo_policy/policy_file api
+oslo_policy/policy_default_rule disable
+oslo_policy/policy_dirs disable
+oslo_policy/policy_file disable
diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings
index ef37401456..02a27afaf0 100644
--- a/tools/autogenerate-config-flagmappings/neutron.flagmappings
+++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings
@@ -475,9 +475,9 @@ oslo_messaging_rabbit/ssl_options rabbitmq
oslo_messaging_rabbit/tcp_user_timeout rabbitmq
oslo_middleware/max_request_body_size api
oslo_middleware/secure_proxy_ssl_header api
-oslo_policy/policy_default_rule api
-oslo_policy/policy_dirs api
-oslo_policy/policy_file api
+oslo_policy/policy_default_rule disable
+oslo_policy/policy_dirs disable
+oslo_policy/policy_file disable
oslo_versionedobjects/fatal_exception_format_errors logging
pluto/shutdown_check_back_off vpnaas_ipsec
pluto/shutdown_check_retries vpnaas_ipsec
diff --git a/tools/autogenerate-config-flagmappings/nova.flagmappings b/tools/autogenerate-config-flagmappings/nova.flagmappings
index a69b2fbce9..e12e77602a 100644
--- a/tools/autogenerate-config-flagmappings/nova.flagmappings
+++ b/tools/autogenerate-config-flagmappings/nova.flagmappings
@@ -703,9 +703,9 @@ oslo_messaging_rabbit/ssl_options rabbitmq
oslo_messaging_rabbit/tcp_user_timeout rabbitmq
oslo_middleware/max_request_body_size api
oslo_middleware/secure_proxy_ssl_header api
-oslo_policy/policy_default_rule policy
-oslo_policy/policy_dirs policy
-oslo_policy/policy_file policy
+oslo_policy/policy_default_rule disable
+oslo_policy/policy_dirs disable
+oslo_policy/policy_file disable
oslo_versionedobjects/fatal_exception_format_errors api
rdp/enabled rdp
rdp/html5_proxy_base_url rdp
diff --git a/tools/autogenerate-config-flagmappings/sahara.flagmappings b/tools/autogenerate-config-flagmappings/sahara.flagmappings
index 9fb4347e40..3fbe1570f5 100644
--- a/tools/autogenerate-config-flagmappings/sahara.flagmappings
+++ b/tools/autogenerate-config-flagmappings/sahara.flagmappings
@@ -272,9 +272,9 @@ oslo_messaging_rabbit/ssl_options rabbitmq
oslo_messaging_rabbit/tcp_user_timeout rabbitmq
oslo_middleware/max_request_body_size api
oslo_middleware/secure_proxy_ssl_header api
-oslo_policy/policy_default_rule policy
-oslo_policy/policy_dirs policy
-oslo_policy/policy_file policy
+oslo_policy/policy_default_rule disable
+oslo_policy/policy_dirs disable
+oslo_policy/policy_file disable
retries/retries_number api
retries/retry_after api
service_auth/admin_password api
diff --git a/tools/autogenerate-config-flagmappings/zaqar.flagmappings b/tools/autogenerate-config-flagmappings/zaqar.flagmappings
index e1695d426a..3649bf9746 100644
--- a/tools/autogenerate-config-flagmappings/zaqar.flagmappings
+++ b/tools/autogenerate-config-flagmappings/zaqar.flagmappings
@@ -116,9 +116,9 @@ keystone_authtoken/revocation_cache_time auth_token
keystone_authtoken/signing_dir auth_token
keystone_authtoken/token_cache_time auth_token
notification/smtp_command api
-oslo_policy/policy_default_rule api
-oslo_policy/policy_dirs api
-oslo_policy/policy_file api
+oslo_policy/policy_default_rule disable
+oslo_policy/policy_dirs disable
+oslo_policy/policy_file disable
pooling:catalog/enable_virtual_pool pooling
service_auth/admin_password api
service_auth/admin_project_domain api