openstack/neutron
Code Issues Proposed changes

Merge "Skip reading config files from neutron.conf.d for the namespace proxy"

Browse Source
This commit is contained in:
Jenkins
2017-02-08 07:25:42 +00:00
committed by Gerrit Code Review
parent a076e13b43 751c62a601
commit 0d53546294
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/agent/metadata/namespace_proxy.py
View File

@@ -139,8 +139,9 @@ class ProxyDaemon(daemon.Daemon):
def main(): def main():
namespace.register_namespace_proxy_opts(cfg.CONF) namespace.register_namespace_proxy_opts(cfg.CONF)
# Don't get the default configuration file # Don't read any default configuration file, just handle cmdline opts
cfg.CONF(project='neutron', default_config_files=[]) cfg.CONF(project='neutron',
default_config_files=[], default_config_dirs=[])
config.setup_logging() config.setup_logging()
utils.log_opt_values(LOG) utils.log_opt_values(LOG)