x
/
fuel-plugin-lma-collector
Code Issues Proposed changes

Enable Keystone v3 API when obtaining users and tenants 

Always use Keystone v3 API obtaining users and projects in order to list all
users and tenants in multi-domain environments.

Change-Id: If94ad4a0d61d0467031b384d132eb433682b3a20
Closes-Bug: #1662142
This commit is contained in:
Danil Akhmetov 2017-02-09 16:54:05 +03:00
parent 3a2c9ce002
commit bc797dfb4b
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
deployment_scripts/puppet/modules/lma_collector/files/collectd/collectd_openstack.py
View File

@ -169,12 +169,11 @@ class CollectdPlugin(base.Base):
def _build_url(self, service, resource): def _build_url(self, service, resource):
s = (self.get_service(service) or {}) s = (self.get_service(service) or {})
# the adminURL must be used to access resources with Keystone API v2 url = s.get('url')
if service == 'keystone' and \ # v3 API must be used in order to obtain tenants in multi-domain envs
(resource in ['tenants', 'users'] or 'OS-KS' in resource): if service == 'keystone' and (resource in ['projects',
url = s.get('admin_url') 'users', 'roles']):
else: url = url.replace('v2.0', 'v3')
url = s.get('url')
if url: if url:
if url[-1] != '/': if url[-1] != '/':

6
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_keystone.py
View File

@ -40,11 +40,11 @@ class KeystoneStatsPlugin(openstack.CollectdPlugin):
return 'enabled' if d.get('enabled') else 'disabled' return 'enabled' if d.get('enabled') else 'disabled'
# tenants # tenants
r = self.get('keystone', 'tenants') r = self.get('keystone', 'projects')
if not r: if not r:
self.logger.warning('Could not find Keystone tenants') self.logger.warning('Could not find Keystone tenants')
return return
tenants_details = r.json().get('tenants', []) tenants_details = r.json().get('projects', [])
status = self.count_objects_group_by(tenants_details, status = self.count_objects_group_by(tenants_details,
group_by_func=groupby) group_by_func=groupby)
for s, nb in status.iteritems(): for s, nb in status.iteritems():
@ -70,7 +70,7 @@ class KeystoneStatsPlugin(openstack.CollectdPlugin):
} }
# roles # roles
r = self.get('keystone', 'OS-KSADM/roles') r = self.get('keystone', 'roles')
if not r: if not r:
self.logger.warning('Could not find Keystone roles') self.logger.warning('Could not find Keystone roles')
return return