diff options
| author | Edwin Zhai <edwin.zhai@intel.com> | 2015-08-26 01:35:14 +0800 |
|---|---|---|
| committer | Edwin Zhai <edwin.zhai@intel.com> | 2015-08-26 07:47:03 +0800 |
| commit | 53c73ec2f8fcdde43d13b3ba505625235417d4f5 (patch) | |
| tree | acb121549389636b9a9d65ec1450ab1f224dd8d2 /ceilometer/service.py | |
| parent | ca4c452bfceb41cd3ec67508f56190e3dfa0d0c9 (diff) | |
| download | ceilometer-53c73ec2f8fcdde43d13b3ba505625235417d4f5.tar.gz | |
Do not use system config file for test
Use dummy config file so that test depends on default config opts
instead of system config file.
Change-Id: I4ffbd389f80bbdb6076cdd99d3b25ffb4a26f32e
Closes-Bug: #1482695
Diffstat (limited to 'ceilometer/service.py')
| -rw-r--r-- | ceilometer/service.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ceilometer/service.py b/ceilometer/service.py index e6e68ed2..aac72424 100644 --- a/ceilometer/service.py +++ b/ceilometer/service.py @@ -112,7 +112,7 @@ cfg.CONF.register_opt(COLL_OPT, 'collector') LOG = log.getLogger(__name__) -def prepare_service(argv=None): +def prepare_service(argv=None, config_files=None): oslo_i18n.enable_lazy() log.register_options(cfg.CONF) log_levels = (cfg.CONF.default_log_levels + @@ -121,7 +121,8 @@ def prepare_service(argv=None): if argv is None: argv = sys.argv cfg.CONF(argv[1:], project='ceilometer', validate_default_values=True, - version=version.version_info.version_string()) + version=version.version_info.version_string(), + default_config_files=config_files) log.setup(cfg.CONF, 'ceilometer') # NOTE(liusheng): guru cannot run with service under apache daemon, so when # ceilometer-api running with mod_wsgi, the argv is [], we don't start |