x
/
distil
Code Issues Proposed changes

Make Distil Health check respect collection domains 

Without this, when that config is set, the healthcheck will
report uncollected projects that aren't being collected
anymore.

Change-Id: Ife60eee1400ec596565188b477d64f68b247fcec
This commit is contained in:
Adrian Turjak 2020-09-24 16:16:27 +12:00
parent 4fe7f644f8
commit 0e7813387c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
distil/service/api/v2/health.py
View File

@ -43,7 +43,8 @@ def get_health():
"""
result = {}
projects_keystone = openstack.get_projects()
projects_keystone = openstack.get_projects(
domains=CONF.collector.include_domains)
keystone_projects = [t['id'] for t in projects_keystone
if t['name'] not in CONF.collector.ignore_tenants]

2
test-requirements.txt
View File

@ -1,7 +1,7 @@
hacking>=0.12.0,!=0.13.0,<0.14 # Apache-2.0
coverage>=4.0,!=4.4 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
pylint==1.4.5 # GPLv2
pylint>=1.4.5 # GPLv2
sqlalchemy-migrate>=0.11.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD