Remove leftover of ceilometer-api support
Change-Id: I844c630235b76e6e1c6de20bf0ccfd2d3148f994
This commit is contained in:
parent
69a89b53a6
commit
26451bdbf6
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The ``[root_cause_analysis_service] ceilometer_version`` option has been
|
||||||
|
removed.
|
@ -37,7 +37,6 @@ RcaServiceGroup = [
|
|||||||
help='Time to wait between subsequent datasource snapshots'),
|
help='Time to wait between subsequent datasource snapshots'),
|
||||||
cfg.IntOpt('zabbix_alarms_per_host', default=2),
|
cfg.IntOpt('zabbix_alarms_per_host', default=2),
|
||||||
cfg.StrOpt('aodh_version', default='2', help='Aodh version'),
|
cfg.StrOpt('aodh_version', default='2', help='Aodh version'),
|
||||||
cfg.StrOpt('ceilometer_version', default='2', help='Ceilometer version'),
|
|
||||||
cfg.StrOpt('nova_version', default='2.11', help='Nova version'),
|
cfg.StrOpt('nova_version', default='2.11', help='Nova version'),
|
||||||
cfg.StrOpt('cinder_version', default='3', help='Cinder version'),
|
cfg.StrOpt('cinder_version', default='3', help='Cinder version'),
|
||||||
cfg.StrOpt('glance_version', default='2', help='Glance version'),
|
cfg.StrOpt('glance_version', default='2', help='Glance version'),
|
||||||
|
@ -25,7 +25,6 @@ CONF = config.CONF
|
|||||||
|
|
||||||
_client_modules = {
|
_client_modules = {
|
||||||
'aodh': 'aodhclient.client',
|
'aodh': 'aodhclient.client',
|
||||||
'ceilometer': 'ceilometerclient.client',
|
|
||||||
'nova': 'novaclient.client',
|
'nova': 'novaclient.client',
|
||||||
'cinder': 'cinderclient.client',
|
'cinder': 'cinderclient.client',
|
||||||
'glance': 'glanceclient.client',
|
'glance': 'glanceclient.client',
|
||||||
@ -48,7 +47,6 @@ class TempestClients(object):
|
|||||||
def class_init(cls, creds):
|
def class_init(cls, creds):
|
||||||
cls.creds = creds
|
cls.creds = creds
|
||||||
cls._vitrage = None
|
cls._vitrage = None
|
||||||
cls._ceilometer = None
|
|
||||||
cls._nova = None
|
cls._nova = None
|
||||||
cls._cinder = None
|
cls._cinder = None
|
||||||
cls._glance = None
|
cls._glance = None
|
||||||
@ -84,21 +82,6 @@ class TempestClients(object):
|
|||||||
session = cls._get_session_for_user()
|
session = cls._get_session_for_user()
|
||||||
return neutron_client.Client(session=session)
|
return neutron_client.Client(session=session)
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def ceilometer(cls):
|
|
||||||
"""ceilometer client
|
|
||||||
|
|
||||||
:rtype: ceilometerclient.v2.client.Client
|
|
||||||
"""
|
|
||||||
if not cls._ceilometer:
|
|
||||||
cm_client = driver_module('ceilometer')
|
|
||||||
client = cm_client.get_client(
|
|
||||||
version=CONF.root_cause_analysis_service.ceilometer_version,
|
|
||||||
session=cls._get_session_for_admin(),
|
|
||||||
)
|
|
||||||
cls._ceilometer = client
|
|
||||||
return cls._ceilometer
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def nova(cls):
|
def nova(cls):
|
||||||
"""nova client
|
"""nova client
|
||||||
|
Loading…
Reference in New Issue
Block a user