From 6f4928b6ef2d88bb681d72818d695bc2310208a2 Mon Sep 17 00:00:00 2001 From: venkatamahesh Date: Wed, 23 Dec 2015 18:51:28 +0530 Subject: [PATCH] [config-ref] Update the cinder, nova api tables Change-Id: I3ea377254c378ef3783eadc3cbaea2046064e7a2 Closes-Bug: #1525743 Closes-Bug: #1528722 --- doc/config-reference/source/tables/cinder-api.rst | 2 -- doc/config-reference/source/tables/nova-api.rst | 2 +- tools/autogenerate-config-flagmappings/cinder.flagmappings | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/doc/config-reference/source/tables/cinder-api.rst b/doc/config-reference/source/tables/cinder-api.rst index ae4b6aec50..b3915a937c 100644 --- a/doc/config-reference/source/tables/cinder-api.rst +++ b/doc/config-reference/source/tables/cinder-api.rst @@ -18,8 +18,6 @@ - Description * - **[DEFAULT]** - - * - ``api_paste_config`` = ``api-paste.ini`` - - (StrOpt) File name for the paste.deploy config for cinder-api * - ``api_rate_limit`` = ``True`` - (BoolOpt) Enables or disables rate limit of the API. * - ``az_cache_duration`` = ``3600`` diff --git a/doc/config-reference/source/tables/nova-api.rst b/doc/config-reference/source/tables/nova-api.rst index 698a3b6be6..28f6485bb1 100644 --- a/doc/config-reference/source/tables/nova-api.rst +++ b/doc/config-reference/source/tables/nova-api.rst @@ -26,7 +26,7 @@ - (IntOpt) Timeout for client connections' socket operations. If an incoming connection is idle for this number of seconds it will be closed. A value of '0' means wait forever. * - ``enable_new_services`` = ``True`` - (BoolOpt) Services to be added to the available pool on create - * - ``enabled_apis`` = ``ec2, osapi_compute, metadata`` + * - ``enabled_apis`` = ``osapi_compute, metadata`` - (ListOpt) A list of APIs to enable by default * - ``enabled_ssl_apis`` = - (ListOpt) A list of APIs with enabled SSL diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings index 33fbb75a68..3c0edbe3cb 100644 --- a/tools/autogenerate-config-flagmappings/cinder.flagmappings +++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings @@ -1,7 +1,6 @@ allocated_capacity_weight_multiplier storage allow_availability_zone_fallback common allowed_direct_url_schemes images -api_paste_config api api_rate_limit api auth_strategy auth available_devices block-device