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
This commit is contained in:
Luka Peschke 2018-04-26 14:54:45 +02:00
parent cda666d04c
commit df485e0b53
2 changed files with 2 additions and 6 deletions

View File

@ -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

View File

@ -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,