openstack/placement
Code Issues Proposed changes

Fix the duplicated config options of api_database and placement_database

Browse Source 
The "api_database" and "placement_database" config options have
their help text duplicated in the configuration reference:

https://docs.openstack.org/nova/latest/configuration/config.html#api-database
https://docs.openstack.org/nova/latest/configuration/config.html#placement-database

Co-Authored-By: Eric Fried <efried@us.ibm.com>
Change-Id: I6a20c13d570b58f2467ad0e7ba595f199e7c7c41
Closes-Bug: #1774754
This commit is contained in:
chenxing 2018-06-21 10:36:27 +08:00
parent 3aace650cc
commit 601ea27693
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/conf/database.py
View File

@ -19,6 +19,7 @@ from oslo_db import options as oslo_db_options
from nova.conf import paths from nova.conf import paths
_DEFAULT_SQL_CONNECTION = 'sqlite:///' + paths.state_path_def('nova.sqlite') _DEFAULT_SQL_CONNECTION = 'sqlite:///' + paths.state_path_def('nova.sqlite')
_ENRICHED = False
# NOTE(markus_z): We cannot simply do: # NOTE(markus_z): We cannot simply do:
@ -169,8 +170,11 @@ def list_opts():
# As I think it is useful to have the "oslo.db" namespace information # As I think it is useful to have the "oslo.db" namespace information
# in the "sample.conf" file, I omit the listing of the "oslo_db_options" # in the "sample.conf" file, I omit the listing of the "oslo_db_options"
# here. # here.
enrich_help_text(api_db_opts) global _ENRICHED
enrich_help_text(placement_db_opts) if not _ENRICHED:
enrich_help_text(api_db_opts)
enrich_help_text(placement_db_opts)
_ENRICHED = True
return { return {
api_db_group: api_db_opts, api_db_group: api_db_opts,
placement_db_group: placement_db_opts, placement_db_group: placement_db_opts,