openstack
/
deb-gnocchi
Code Issues Proposed changes

Merge "default_aggregation_methods configuration worked in gnocchi-upgrade"

This commit is contained in:
Jenkins 2017-04-13 16:55:58 +00:00 committed by Gerrit Code Review
parent 89d069c29a 3c224fc179
commit 8c7513cc4d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnocchi/service.py
View File

@ -45,17 +45,17 @@ def prepare_service(args=None, conf=None,
conf.register_opts(list(options),
group=None if group == "DEFAULT" else group)
# HACK(jd) I'm not happy about that, fix AP class to handle a conf object?
archive_policy.ArchivePolicy.DEFAULT_AGGREGATION_METHODS = (
conf.archive_policy.default_aggregation_methods
)
conf.set_default("workers", utils.get_default_workers(), group="metricd")
conf(args, project='gnocchi', validate_default_values=True,
default_config_files=default_config_files,
version=pbr.version.VersionInfo('gnocchi').version_string())
# HACK(jd) I'm not happy about that, fix AP class to handle a conf object?
archive_policy.ArchivePolicy.DEFAULT_AGGREGATION_METHODS = (
conf.archive_policy.default_aggregation_methods
)
# If no coordination URL is provided, default to using the indexer as
# coordinator
if conf.storage.coordination_url is None: