diff options
author | Jay Lau <liugya@cn.ibm.com> | 2013-08-01 19:41:26 +0800 |
---|---|---|
committer | Jay Lau <liugya@cn.ibm.com> | 2013-08-01 19:42:08 +0800 |
commit | f571bd45f6134f8498b204cd3ab7014815c118da (patch) | |
tree | a4f55c7b97a2638a51777910a4c7ea80a8a0f072 /ceilometer/nova_client.py | |
parent | ed89d402f9cfec8ccad1975038425fc9e20d9c35 (diff) | |
download | ceilometer-f571bd45f6134f8498b204cd3ab7014815c118da.tar.gz |
Update nova_client.py
In nova_client.py:Client:__init__, there is already a variable
for conf: conf = cfg.CONF.service_credentials, so we can replace
all cfg.CONF.service_credentials to conf for this function
Change-Id: I74ac9cde00af00457b026fd13a43af6a2bf88ad0
Diffstat (limited to 'ceilometer/nova_client.py')
-rw-r--r-- | ceilometer/nova_client.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ceilometer/nova_client.py b/ceilometer/nova_client.py index 8dda2d9d..40726e26 100644 --- a/ceilometer/nova_client.py +++ b/ceilometer/nova_client.py @@ -47,12 +47,12 @@ class Client(object): conf = cfg.CONF.service_credentials tenant = conf.os_tenant_id and conf.os_tenant_id or conf.os_tenant_name self.nova_client = nova_client.Client( - username=cfg.CONF.service_credentials.os_username, - api_key=cfg.CONF.service_credentials.os_password, + username=conf.os_username, + api_key=conf.os_password, project_id=tenant, - auth_url=cfg.CONF.service_credentials.os_auth_url, - endpoint_type=cfg.CONF.service_credentials.os_endpoint_type, - cacert=cfg.CONF.service_credentials.os_cacert, + auth_url=conf.os_auth_url, + endpoint_type=conf.os_endpoint_type, + cacert=conf.os_cacert, no_cache=True) def _with_flavor_and_image(self, instances): |