x
/
osops-tools-monitoring
Code Issues Proposed changes

Drop support for tenant_name & tenant_id for cinderclient 

Upstream has dropped support for tenant_name & tenant_id [1] and it needs to be
updated here. Replacing it with project_id and removing the other one seems to
fix the issue.

[1] https://review.opendev.org/653814

Change-Id: I2a9cc06fd96ddc9e5c762648ba6d05709bb0bc70
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2019-10-16 07:56:49 -07:00
parent b797e26e01
commit bafe3f0d2f
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
monitoring-for-openstack/oschecks/utils.py
View File

@ -238,16 +238,11 @@ class Cinder(object):
client = client.get_client_class(api_version)( client = client.get_client_class(api_version)(
options.os_username, options.os_username,
options.os_password, options.os_password,
tenant_name=getattr( project_id=getattr(
options, 'os_project_name', getattr( options, 'os_project_name', getattr(
options, 'os_tenant_name', None options, 'os_tenant_name', None
) )
), ),
tenant_id=getattr(
options, 'os_project_id', getattr(
options, 'os_tenant_id', None
)
),
auth_url=options.os_auth_url, auth_url=options.os_auth_url,
region_name=options.os_region_name, region_name=options.os_region_name,
cacert=options.os_cacert, cacert=options.os_cacert,