Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "pass default_config_dirs variable for config initialization." into stable/rocky

Browse Source
This commit is contained in:
Zuul
2019-09-18 02:00:25 +00:00
committed by Gerrit Code Review
parent 5c7fcc22c0 4db5a58d0d
commit 214ee82e45
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
watcher/common/config.py
View File

@@ -21,12 +21,15 @@ from watcher.common import rpc
from watcher import version from watcher import version
def parse_args(argv, default_config_files=None): def parse_args(argv, default_config_files=None, default_config_dirs=None):
default_config_files = (default_config_files or default_config_files = (default_config_files or
cfg.find_config_files(project='watcher')) cfg.find_config_files(project='watcher'))
default_config_dirs = (default_config_dirs or
cfg.find_config_dirs(project='watcher'))
rpc.set_defaults(control_exchange='watcher') rpc.set_defaults(control_exchange='watcher')
cfg.CONF(argv[1:], cfg.CONF(argv[1:],
project='python-watcher', project='python-watcher',
version=version.version_info.release_string(), version=version.version_info.release_string(),
default_config_dirs=default_config_dirs,
default_config_files=default_config_files) default_config_files=default_config_files)
rpc.init(cfg.CONF) rpc.init(cfg.CONF)