stackforge/rubick
Code Issues Proposed changes

Fixed incorrect logic in Keystone endpoint inspection

Browse Source
This commit is contained in:
Maxim Kulkin
2013-11-06 17:01:34 +04:00
parent 4b56904911
commit 9f25927e12
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rubick/inspections/keystone_endpoints.py
View File

@@ -9,9 +9,9 @@ SERVICE_ENDPOINT_MSG = """
Keystone catalog has endpoint for service "%s" (id %s) that has "%s" Keystone catalog has endpoint for service "%s" (id %s) that has "%s"
""".strip() """.strip()
UNKNOWN_HOST_ENDPOINT_MSG = (SERVICE_ENDPOINT_MSG + UNKNOWN_HOST_ENDPOINT_MSG = (SERVICE_ENDPOINT_MSG +
'set pointing to unknown host') ' set pointing to unknown host')
UNKNOWN_SERVICE_ENDPOINT_MSG = (SERVICE_ENDPOINT_MSG + UNKNOWN_SERVICE_ENDPOINT_MSG = (SERVICE_ENDPOINT_MSG +
'set pointing to no service') ' set pointing to no service')
class KeystoneEndpointsInspection(Inspection): class KeystoneEndpointsInspection(Inspection):
@@ -50,19 +50,20 @@ class KeystoneEndpointsInspection(Inspection):
(service['name'], service['id'], url_attr))) (service['name'], service['id'], url_attr)))
continue continue
nova_compute = None nova_api = None
for c in host.components: for c in host.components:
if c.name != 'nova-compute': if c.name != 'nova-api':
continue continue
listen_address = c.config['osapi_compute_listen'] listen_address = c.config['osapi_compute_listen']
listen_port = c.config['osapi_compute_listen_port'] listen_port = c.config['osapi_compute_listen_port']
if (listen_address in ['0.0.0.0', url.hostname] and if (listen_address in ['0.0.0.0', url.hostname] and
listen_port == url.port): listen_port == url.port):
nova_compute = c nova_api = c
break break
if not nova_compute: if not nova_api:
keystone.report_issue( keystone.report_issue(
Issue(Issue.ERROR, UNKNOWN_SERVICE_ENDPOINT_MSG % Issue(Issue.ERROR, UNKNOWN_SERVICE_ENDPOINT_MSG %
(service['name'], service['id'], url_attr))) (service['name'], service['id'], url_attr)))