openstack/aodh
Code Issues Proposed changes

Merge "Remove redundant code in nova_client.Client"

Browse Source
This commit is contained in:
Jenkins 2014-01-07 07:41:42 +00:00 committed by Gerrit Code Review
commit 2245becc28
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ceilometer/nova_client.py
View File

@ -41,11 +41,12 @@ def logged(func):
class Client(object): class Client(object):
"""A client which gets information via python-novaclient."""
def __init__(self): def __init__(self):
"""Returns a nova Client object.""" """Initialize a nova client object."""
conf = cfg.CONF.service_credentials conf = cfg.CONF.service_credentials
tenant = conf.os_tenant_id and conf.os_tenant_id or conf.os_tenant_name tenant = conf.os_tenant_id or conf.os_tenant_name
self.nova_client = nova_client.Client( self.nova_client = nova_client.Client(
username=conf.os_username, username=conf.os_username,
api_key=conf.os_password, api_key=conf.os_password,