Merge "NSX|V: only update host groups if AZ correctly defined"

This commit is contained in:
Jenkins 2017-06-29 07:53:25 +00:00 committed by Gerrit Code Review
commit b85f056932

View File

@ -378,9 +378,13 @@ def _update_host_group_for_edge(nsxv, cluster_mng, edge_id, edge):
cfg.CONF.nsxv.availability_zones)
zones = nsx_az.NsxVAvailabilityZones()
az = zones.get_availability_zone(az_name)
edge_utils.update_edge_host_groups(nsxv, edge_id,
cluster_mng, az,
validate=True)
if az.edge_ha and az.edge_host_groups:
edge_utils.update_edge_host_groups(nsxv, edge_id,
cluster_mng, az,
validate=True)
else:
LOG.error("%s does not have HA enabled or no host "
"groups defined. Skipping %s.", az_name, edge_id)
except Exception as e:
LOG.error("Failed to update edge %(id)s - %(e)s",
{'id': edge['id'],