Merge pull request canonical#9 from jacekn/master

Fix canonical#7 (trusty python-novaclient compatibilty problem)
jjo · Mar 28, 2017 · 3127482 · 3127482
2 parents e34e187 + ea08659
commit 3127482
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/prometheus-openstack-exporter b/prometheus-openstack-exporter
@@ -60,20 +60,19 @@ class DataGatherer(Thread):
             "auth_url": env['OS_AUTH_URL'],
             "region_name": env['OS_REGION_NAME']
         }
-        creds_nova = {
-            "username": env['OS_USERNAME'],
-            "api_key": env['OS_PASSWORD'],
-            "auth_url": env['OS_AUTH_URL'],
-            "region_name": env['OS_REGION_NAME']
-        }
+        creds_nova = [
+            2,
+            env['OS_USERNAME'],
+            env['OS_PASSWORD'],
+            env['OS_TENANT_NAME'],
+            env['OS_AUTH_URL'],
+        ]
 
         while True:
             start_time = time()
             try:
                 keystone = keystone_client.Client(**creds)
-                # lp#1233492
-                creds_nova["tenant_id"] = keystone.tenant_id
-                nova = nova_client.Client(2, **creds_nova)
+                nova = nova_client.Client(*creds_nova)
                 neutron = neutron_client.Client(**creds)
 
                 prodstack['tenants'] = [x._info for x in keystone.tenants.list()]