openstack/ceilometer
Code Issues Proposed changes

tripleo: Fix logging of tripleo discovery

Browse Source 
This change doesn't log error message when the instance in nova is
not an Ironic node deployed by Tripleo.

Change-Id: Ic915825e795291cd688cffe2b1e1263f325546f9
Closes-bug: #1658656
This commit is contained in:
Mehdi Abaakouk 2017-01-23 12:30:08 +01:00
parent 40da6c9748
commit d1b25ebbe9
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ceilometer/hardware/discovery.py
View File

@ -62,10 +62,6 @@ class NodesDiscoveryTripleO(plugin_base.DiscoveryBase):
self.last_run = None self.last_run = None
self.instances = {} self.instances = {}
def _address(self, instance, field):
addresses = instance.addresses[self.conf.hardware.tripleo_network_name]
return addresses[0].get(field)
def _make_resource_url(self, ip): def _make_resource_url(self, ip):
hwconf = self.conf.hardware hwconf = self.conf.hardware
url = hwconf.url_scheme url = hwconf.url_scheme
@ -112,15 +108,21 @@ class NodesDiscoveryTripleO(plugin_base.DiscoveryBase):
resources = [] resources = []
for instance in self.instances.values(): for instance in self.instances.values():
addresses = instance.addresses.get(
self.conf.hardware.tripleo_network_name)
if addresses is None:
# NOTE(sileht): This is not a tripleo undercloud instance, this
# is a cheap detection if ironic node deployed by tripleo, but
# nova don't expose anything more useful and we must not log a
# ERROR when the instance is not a tripleo undercloud one.
continue
try: try:
ip_address = self._address(instance, 'addr') ip_address = addresses[0].get('addr')
final_address = self._make_resource_url(ip_address) final_address = self._make_resource_url(ip_address)
resource = { resource = {
'resource_id': instance.id, 'resource_id': instance.id,
'resource_url': final_address, 'resource_url': final_address,
'mac_addr': self._address(instance, 'mac_addr': addresses[0].get('OS-EXT-IPS-MAC:mac_addr'),
'OS-EXT-IPS-MAC:mac_addr'),
'image_id': instance.image['id'], 'image_id': instance.image['id'],
'flavor_id': instance.flavor['id'] 'flavor_id': instance.flavor['id']
} }