Merge "python-ceilometerclient-2.8.1+ compatibility patch"
This commit is contained in:
commit
62160d1068
|
@ -22,7 +22,7 @@ import json
|
|||
import re
|
||||
|
||||
from oschecks import utils
|
||||
from ceilometerclient.openstack.common.apiclient import exceptions
|
||||
from ceilometerclient import exc
|
||||
|
||||
|
||||
def _check_ceilometer_api():
|
||||
|
@ -36,12 +36,13 @@ def _check_ceilometer_api():
|
|||
def meters_list():
|
||||
try:
|
||||
return client.meters.list()
|
||||
except exceptions.Gone as ex:
|
||||
msg = json.loads(ex.response.content)
|
||||
utils.warning(re.sub(r'\s\s*', ' ', msg['error_message']))
|
||||
except exc.HTTPNotFound as ex:
|
||||
utils.warning('Did not find Ceilometer API running '
|
||||
'on given endpoint')
|
||||
except Exception as ex:
|
||||
utils.critical(str(ex))
|
||||
|
||||
|
||||
elapsed, meters = utils.timeit(meters_list)
|
||||
if not meters:
|
||||
utils.critical("Unable to contact Ceilometer API.")
|
||||
|
|
|
@ -188,11 +188,6 @@ class Ceilometer(object):
|
|||
from ceilometerclient import shell
|
||||
self.ceilometer = shell.CeilometerShell()
|
||||
self.base_argv = copy.deepcopy(sys.argv[1:])
|
||||
# NOTE(gordc): workaround for bug1434264
|
||||
if not hasattr(self.ceilometer, 'auth_plugin'):
|
||||
from ceilometerclient import client
|
||||
if hasattr(client, 'AuthPlugin'):
|
||||
self.ceilometer.auth_plugin = client.AuthPlugin()
|
||||
self.ceilometer.parser = self.ceilometer.get_base_parser()
|
||||
self.add_argument = self.ceilometer.parser.add_argument
|
||||
|
||||
|
|
Loading…
Reference in New Issue