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

This commit is contained in:
Jenkins
2017-02-08 07:25:42 +00:00
committed by Gerrit Code Review

View File

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