Fix issues on stable/rocky
This patch fixes issues present to stable/rocky branch. Due to heavy refactoring in later branches backporting is no possible. Change-Id: I896a7c49eea1b267099fc90d837458ec7bb7853d Signed-off-by: Stamatis Katsaounis <skatsaounis@admin.grnet.gr>
This commit is contained in:
parent
214ee82e45
commit
6a4a9af538
@ -239,10 +239,6 @@ so that the watcher service is configured for your needs.
|
|||||||
|
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
|
|
||||||
# The messaging driver to use, defaults to rabbit. Other drivers
|
|
||||||
# include qpid and zmq. (string value)
|
|
||||||
#rpc_backend = rabbit
|
|
||||||
|
|
||||||
# The default exchange under which topics are scoped. May be
|
# The default exchange under which topics are scoped. May be
|
||||||
# overridden by an exchange name specified in the transport_url
|
# overridden by an exchange name specified in the transport_url
|
||||||
# option. (string value)
|
# option. (string value)
|
||||||
|
@ -265,8 +265,7 @@ class Service(service.ServiceBase):
|
|||||||
allow_requeue=False, pool=CONF.host)
|
allow_requeue=False, pool=CONF.host)
|
||||||
|
|
||||||
def start(self):
|
def start(self):
|
||||||
LOG.debug("Connecting to '%s' (%s)",
|
LOG.debug("Connecting to '%s'", CONF.transport_url)
|
||||||
CONF.transport_url, CONF.rpc_backend)
|
|
||||||
if self.conductor_topic_handler:
|
if self.conductor_topic_handler:
|
||||||
self.conductor_topic_handler.start()
|
self.conductor_topic_handler.start()
|
||||||
if self.notification_handler:
|
if self.notification_handler:
|
||||||
@ -275,8 +274,7 @@ class Service(service.ServiceBase):
|
|||||||
self.heartbeat.start()
|
self.heartbeat.start()
|
||||||
|
|
||||||
def stop(self):
|
def stop(self):
|
||||||
LOG.debug("Disconnecting from '%s' (%s)",
|
LOG.debug("Disconnecting from '%s' (%s)'", CONF.transport_url)
|
||||||
CONF.transport_url, CONF.rpc_backend)
|
|
||||||
if self.conductor_topic_handler:
|
if self.conductor_topic_handler:
|
||||||
self.conductor_topic_handler.stop()
|
self.conductor_topic_handler.stop()
|
||||||
if self.notification_handler:
|
if self.notification_handler:
|
||||||
|
@ -69,7 +69,7 @@ class GnocchiHelper(base.DataSourceBase):
|
|||||||
|
|
||||||
def statistic_aggregation(self, resource_id=None, meter_name=None,
|
def statistic_aggregation(self, resource_id=None, meter_name=None,
|
||||||
period=300, granularity=300, dimensions=None,
|
period=300, granularity=300, dimensions=None,
|
||||||
aggregation='avg', group_by='*'):
|
aggregation='mean', group_by='*'):
|
||||||
"""Representing a statistic aggregate by operators
|
"""Representing a statistic aggregate by operators
|
||||||
|
|
||||||
:param resource_id: id of resource to list statistics for.
|
:param resource_id: id of resource to list statistics for.
|
||||||
|
@ -29,7 +29,12 @@ class DataSourceManager(object):
|
|||||||
self._monasca = None
|
self._monasca = None
|
||||||
self._gnocchi = None
|
self._gnocchi = None
|
||||||
self.metric_map = base.DataSourceBase.METRIC_MAP
|
self.metric_map = base.DataSourceBase.METRIC_MAP
|
||||||
self.datasources = self.config.datasources
|
if hasattr(self.config, 'datasources'):
|
||||||
|
self.datasources = self.config.datasources
|
||||||
|
elif hasattr(self.config, 'datasource'):
|
||||||
|
self.datasources = [self.config.datasource]
|
||||||
|
else:
|
||||||
|
self.datasources = []
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def ceilometer(self):
|
def ceilometer(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user