From d9d9fbcd77656f19909e986bfbce09ba0e5b03c7 Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Fri, 21 Aug 2020 17:36:43 -0400 Subject: [PATCH] [doc] clean up compute client options Clean up some tables in our documention that still mention obsolete, removed configuration options. When we fix https://bugs.launchpad.net/manila/+bug/1713062 fixes of this kind will no longer be required, since the tables in question will (again) be auto-generated from our code. Closes-bug: #1559265 Depends-on: https://review.opendev.org/#/c/745206/ Change-Id: I1b36f8d35162a3ac326ba24852d35dbae09c3aaa --- .../configuration/tables/manila-compute.inc | 32 ++++++------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/doc/source/configuration/tables/manila-compute.inc b/doc/source/configuration/tables/manila-compute.inc index a565217145..41ad36e9ca 100644 --- a/doc/source/configuration/tables/manila-compute.inc +++ b/doc/source/configuration/tables/manila-compute.inc @@ -1,12 +1,6 @@ .. - 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. + Note: this file is actually not auto-generated. See + https://bugs.launchpad.net/manila/+bug/1713062. .. _manila-compute: @@ -16,19 +10,11 @@ * - Configuration option = Default value - Description - * - **[DEFAULT]** + * - **[nova]** - - * - ``nova_admin_auth_url`` = ``http://localhost:5000/v2.0`` - - (String) DEPRECATED: Identity service URL. This option isn't used any longer. Please use [nova] url instead. - * - ``nova_admin_password`` = ``None`` - - (String) DEPRECATED: Nova admin password. This option isn't used any longer. Please use [nova] password instead. - * - ``nova_admin_tenant_name`` = ``service`` - - (String) DEPRECATED: Nova admin tenant name. This option isn't used any longer. Please use [nova] tenant instead. - * - ``nova_admin_username`` = ``nova`` - - (String) DEPRECATED: Nova admin username. This option isn't used any longer. Please use [nova] username instead. - * - ``nova_catalog_admin_info`` = ``compute:nova:adminURL`` - - (String) DEPRECATED: Same as nova_catalog_info, but for admin endpoint. This option isn't used any longer. - * - ``nova_catalog_info`` = ``compute:nova:publicURL`` - - (String) DEPRECATED: Info to match when looking for nova in the service catalog. Format is separated values of the form: :: This option isn't used any longer. - * - ``os_region_name`` = ``None`` - - (String) Region name of this node. + * - ``api_microversion`` = ``2.10`` + - (String) Version of Nova API to be used. + * - ``endpoint_type`` = ``publicURL`` + - (String) Endpoint type to be used with nova client calls. + * - ``region_name`` = ``None`` + - (String) Region name for connecting to nova.