openstack/monasca-agent
Code Issues Proposed changes

Fix nova client init for libvirt and ovs plugins

Browse Source 
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
This commit is contained in:
Brad Klein 2017-01-27 13:57:30 -07:00
parent 50ab293b80
commit 8c12e87189
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
monasca_agent/collector/checks_d/libvirt.py
View File

@ -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'))

9
monasca_agent/collector/checks_d/ovs.py
View File

@ -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)