From 8c12e87189eab7eefa44410e80f8e405731a6792 Mon Sep 17 00:00:00 2001
From: Brad Klein <bradley.klein@charter.com>
Date: Fri, 27 Jan 2017 13:57:30 -0700
Subject: [PATCH] Fix nova client init for libvirt and ovs plugins

Positional args don't line up with the latest nova client,
libvirt and ovs get 401/unauth with the current monasca
code.

Change-Id: I2beace5fb1db39535c3f08b5a16d06b15bfeb976
---
 monasca_agent/collector/checks_d/libvirt.py | 9 +++++----
 monasca_agent/collector/checks_d/ovs.py     | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/monasca_agent/collector/checks_d/libvirt.py b/monasca_agent/collector/checks_d/libvirt.py
index a0d2ca48..25ffacc9 100644
--- a/monasca_agent/collector/checks_d/libvirt.py
+++ b/monasca_agent/collector/checks_d/libvirt.py
@@ -128,10 +128,11 @@ class LibvirtCheck(AgentCheck):
         port_cache = None
         netns = None
         # Get a list of all instances from the Nova API
-        nova_client = client.Client(2, self.init_config.get('admin_user'),
-                                    self.init_config.get('admin_password'),
-                                    self.init_config.get('admin_tenant_name'),
-                                    self.init_config.get('identity_uri'),
+        nova_client = client.Client(2,
+                                    username=self.init_config.get('admin_user'),
+                                    password=self.init_config.get('admin_password'),
+                                    project_name=self.init_config.get('admin_tenant_name'),
+                                    auth_url=self.init_config.get('identity_uri'),
                                     endpoint_type='internalURL',
                                     service_type="compute",
                                     region_name=self.init_config.get('region_name'))
diff --git a/monasca_agent/collector/checks_d/ovs.py b/monasca_agent/collector/checks_d/ovs.py
index 26042a04..ab1bc20d 100644
--- a/monasca_agent/collector/checks_d/ovs.py
+++ b/monasca_agent/collector/checks_d/ovs.py
@@ -296,10 +296,11 @@ class OvsCheck(AgentCheck):
         auth_url = self.init_config.get('identity_uri')
         region_name = self.init_config.get('region_name')
 
-        nc = nova_client.Client(2, username,
-                                password,
-                                tenant_name,
-                                auth_url,
+        nc = nova_client.Client(2,
+                                username=username,
+                                password=password,
+                                project_name=tenant_name,
+                                auth_url=auth_url,
                                 endpoint_type='internalURL',
                                 service_type="compute",
                                 region_name=region_name)