0861fc2d22
CLI options must be registered before the command line is parsed or a cfg.ArgsAlreadyParsedError is raised. Since commit2cbea24we are registering two 'remote_debug' arguments in nova.service. In commitb506529, we see a hack being added to ensure that nova.service is imported and the CLI opts registered before config.parse_args() is called. To clean this up somewhat, refactor all the elements of this remote debugger support into nova.debugger. Avoid importing modules at module import time since we need to import this before monkey patching. Add a function for registering the CLI options just before config.parse_args() is called. And fail gracefully if the CLI options aren't registered when we called debugger.init(). Note that because the options aren't registered at module import time any more, the config generator doesn't pick them up. However, that's actually a good thing since this support doesn't work if you enable it via config files since debugger.enabled() only looks at the command line. DocImpact: remote_debug options are not available via the config file, only via the command line. Change-Id: I97f747a2fb9222137203657df1d86ba89f3219e2
39 lines
1.4 KiB
Python
39 lines
1.4 KiB
Python
# Copyright 2010 United States Government as represented by the
|
|
# Administrator of the National Aeronautics and Space Administration.
|
|
# All Rights Reserved.
|
|
# Copyright 2012 Red Hat, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from oslo.config import cfg
|
|
|
|
from nova import debugger
|
|
from nova.openstack.common.db import options
|
|
from nova import paths
|
|
from nova import rpc
|
|
from nova import version
|
|
|
|
_DEFAULT_SQL_CONNECTION = 'sqlite:///' + paths.state_path_def('nova.sqlite')
|
|
|
|
|
|
def parse_args(argv, default_config_files=None):
|
|
options.set_defaults(sql_connection=_DEFAULT_SQL_CONNECTION,
|
|
sqlite_db='nova.sqlite')
|
|
rpc.set_defaults(control_exchange='nova')
|
|
debugger.register_cli_opts()
|
|
cfg.CONF(argv[1:],
|
|
project='nova',
|
|
version=version.version_string(),
|
|
default_config_files=default_config_files)
|
|
rpc.init(cfg.CONF)
|