nova_client: stop using global conf

Change-Id: Id4273c6d4b80e1e4b4d23dedb1e786da74d794be

1 files changed, 9 insertions, 9 deletions

diff --git a/ceilometer/nova_client.py b/ceilometer/nova_client.py
index 55d5cde6..e2c55b2f 100644
--- a/ceilometer/nova_client.py
+++ b/ceilometer/nova_client.py
@@ -62,12 +62,12 @@ def logged(func):
 class Client(object):
     """A client which gets information via python-novaclient."""
 
-    def __init__(self):
+    def __init__(self, conf):
         """Initialize a nova client object."""
-        conf = cfg.CONF.service_credentials
+        creds = conf.service_credentials
 
         logger = None
-        if cfg.CONF.nova_http_log_debug:
+        if conf.nova_http_log_debug:
             logger = log.getLogger("novaclient-debug")
             logger.logger.setLevel(log.DEBUG)
         ks_session = keystone_client.get_session()
@@ -77,17 +77,17 @@ class Client(object):
             session=ks_session,
 
             # nova adapter options
-            region_name=conf.region_name,
-            interface=conf.interface,
-            service_type=cfg.CONF.service_types.nova,
+            region_name=creds.region_name,
+            interface=creds.interface,
+            service_type=conf.service_types.nova,
             logger=logger)
 
         self.glance_client = glanceclient.Client(
             version='2',
             session=ks_session,
-            region_name=conf.region_name,
-            interface=conf.interface,
-            service_type=cfg.CONF.service_types.glance)
+            region_name=creds.region_name,
+            interface=creds.interface,
+            service_type=conf.service_types.glance)
 
     def _with_flavor_and_image(self, instances):
         flavor_cache = {}