stackforge/rubick
Code Issues Proposed changes

Added fix to prevent error in some service discovery to ruin the whole process

Browse Source
This commit is contained in:
Maxim Kulkin
2013-11-05 18:29:07 +04:00
parent ff2269c703
commit e1ea0c68da
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rubick/discovery.py
View File

@@ -249,19 +249,17 @@ class OpenstackDiscovery(object):
host.id = self._collect_host_id(client)
host.network_addresses = self._collect_host_network_addresses(client)
host.add_component(self._collect_keystone_data(client))
host.add_component(self._collect_nova_api_data(client))
host.add_component(self._collect_nova_compute_data(client))
host.add_component(self._collect_nova_scheduler_data(client))
host.add_component(self._collect_glance_api_data(client))
host.add_component(self._collect_glance_registry_data(client))
host.add_component(self._collect_cinder_api_data(client))
host.add_component(self._collect_cinder_volume_data(client))
host.add_component(self._collect_cinder_scheduler_data(client))
host.add_component(self._collect_mysql_data(client))
host.add_component(self._collect_rabbitmq_data(client))
host.add_component(self._collect_neutron_server_data(client))
host.add_component(self._collect_swift_proxy_server_data(client))
for component in ['keystone', 'nova_api', 'nova_compute',
'nova_scheduler', 'glance_api', 'glance_registry',
'cinder_api', 'cinder_volume', 'cinder_scheduler',
'mysql', 'rabbitmq', 'neutron_server',
'swift_proxy_server']:
method = '_collect_%s_data' % component
if hasattr(self, method):
try:
host.add_component(getattr(self, method)(client))
except:
traceback.print_exc()
return host