From df485e0b535b6e3a9a15705f4b21355f1edac92e Mon Sep 17 00:00:00 2001 From: Luka Peschke Date: Thu, 26 Apr 2018 14:54:45 +0200 Subject: [PATCH] Remove collector from storage Given that the Gnocchi storage doesn't exist anymore, there is no reason for the storage to have a reference to the collector. Change-Id: Ia7dea586445647447d9cd22de3b307015ad6e86d --- cloudkitty/orchestrator.py | 2 +- cloudkitty/storage/__init__.py | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cloudkitty/orchestrator.py b/cloudkitty/orchestrator.py index e64ec192..92b8df3b 100644 --- a/cloudkitty/orchestrator.py +++ b/cloudkitty/orchestrator.py @@ -231,7 +231,7 @@ class Orchestrator(object): transformers = transformer.get_transformers() self.collector = collector.get_collector(transformers) - self.storage = storage.get_storage(collector=self.collector) + self.storage = storage.get_storage() # RPC self.server = None diff --git a/cloudkitty/storage/__init__.py b/cloudkitty/storage/__init__.py index c1e8445d..3c009197 100644 --- a/cloudkitty/storage/__init__.py +++ b/cloudkitty/storage/__init__.py @@ -22,7 +22,6 @@ from oslo_log import log as logging import six from stevedore import driver -from cloudkitty import collector as ck_collector from cloudkitty import utils as ck_utils @@ -37,12 +36,9 @@ METRICS_CONF = ck_utils.get_metrics_conf(CONF.collect.metrics_conf) STORAGES_NAMESPACE = 'cloudkitty.storage.backends' -def get_storage(collector=None): - if not collector: - collector = ck_collector.get_collector() +def get_storage(): storage_args = { 'period': METRICS_CONF.get('period', 3600), - 'collector': collector, } backend = driver.DriverManager( STORAGES_NAMESPACE,