openstack/placement
Code Issues Proposed changes

Merge "Fix the duplicated config options of api_database and placement_database"

Browse Source
This commit is contained in:
Zuul 2018-06-28 14:14:49 +00:00 committed by Gerrit Code Review
commit aeb95b5739
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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.
global _ENRICHED
if not _ENRICHED:
enrich_help_text(api_db_opts) enrich_help_text(api_db_opts)
enrich_help_text(placement_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,