From 395723f2cde4d8ab8664c237b1b28bbcef0e4cc8 Mon Sep 17 00:00:00 2001 From: KATO Tomoyuki Date: Fri, 14 Oct 2016 08:59:34 +0900 Subject: [PATCH] [config-ref] update zaqar config options for Newton Change-Id: I8e2faa48e90171c9fa9ac21855a4194af934377d --- doc/config-reference/source/tables/zaqar-api.rst | 2 ++ doc/config-reference/source/tables/zaqar-websocket.rst | 2 +- doc/config-reference/source/tables/zaqar-wsgi.rst | 2 +- tools/autogenerate-config-flagmappings/zaqar.flagmappings | 1 + tools/autogenerate-config-flagmappings/zaqar.headers | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/config-reference/source/tables/zaqar-api.rst b/doc/config-reference/source/tables/zaqar-api.rst index 9a780c0f06..bb1fe43a7d 100644 --- a/doc/config-reference/source/tables/zaqar-api.rst +++ b/doc/config-reference/source/tables/zaqar-api.rst @@ -20,6 +20,8 @@ - * - ``admin_mode`` = ``False`` - (Boolean) Activate privileged endpoints. + * - ``enable_deprecated_api_versions`` = + - (List) List of deprecated API versions to enable. * - ``unreliable`` = ``False`` - (Boolean) Disable all reliability constraints. * - **[notification]** diff --git a/doc/config-reference/source/tables/zaqar-websocket.rst b/doc/config-reference/source/tables/zaqar-websocket.rst index 618072715e..54291067ab 100644 --- a/doc/config-reference/source/tables/zaqar-websocket.rst +++ b/doc/config-reference/source/tables/zaqar-websocket.rst @@ -19,7 +19,7 @@ * - **[drivers:transport:websocket]** - * - ``bind`` = ``127.0.0.1`` - - (Unknown) Address on which the self-hosting server will listen. + - (IP) Address on which the self-hosting server will listen. * - ``external_port`` = ``None`` - (Port number) Port on which the service is provided to the user. * - ``port`` = ``9000`` diff --git a/doc/config-reference/source/tables/zaqar-wsgi.rst b/doc/config-reference/source/tables/zaqar-wsgi.rst index 5b22bcb582..f0e6c89733 100644 --- a/doc/config-reference/source/tables/zaqar-wsgi.rst +++ b/doc/config-reference/source/tables/zaqar-wsgi.rst @@ -19,6 +19,6 @@ * - **[drivers:transport:wsgi]** - * - ``bind`` = ``127.0.0.1`` - - (Unknown) Address on which the self-hosting server will listen. + - (IP) Address on which the self-hosting server will listen. * - ``port`` = ``8888`` - (Port number) Port on which the self-hosting server will listen. diff --git a/tools/autogenerate-config-flagmappings/zaqar.flagmappings b/tools/autogenerate-config-flagmappings/zaqar.flagmappings index 6d89e8be7e..a15c43999a 100644 --- a/tools/autogenerate-config-flagmappings/zaqar.flagmappings +++ b/tools/autogenerate-config-flagmappings/zaqar.flagmappings @@ -2,6 +2,7 @@ admin_mode api auth_strategy authentication debug disable default_log_levels disable +enable_deprecated_api_versions api fatal_deprecations disable instance_format disable instance_uuid_format disable diff --git a/tools/autogenerate-config-flagmappings/zaqar.headers b/tools/autogenerate-config-flagmappings/zaqar.headers index 1132329921..df72a1d13b 100644 --- a/tools/autogenerate-config-flagmappings/zaqar.headers +++ b/tools/autogenerate-config-flagmappings/zaqar.headers @@ -6,4 +6,5 @@ redis Redis sqlalchemy SQLAlchemy storage storage transport transport +trustee trustee websocket Websocket