From f03038a7ae056b3626c389028657aef462df6ff0 Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Tue, 27 Jun 2017 00:34:01 -0700 Subject: [PATCH] NSX|V: only update host groups if AZ correctly defined Only update host groups if HA and host groups are defined for the AZ Change-Id: I47ca785f0ced8fe926f0354c4c1a2b8b04709be2 --- vmware_nsx/shell/admin/plugins/nsxv/resources/edges.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/vmware_nsx/shell/admin/plugins/nsxv/resources/edges.py b/vmware_nsx/shell/admin/plugins/nsxv/resources/edges.py index d5ac2911c2..7bd449e7c8 100644 --- a/vmware_nsx/shell/admin/plugins/nsxv/resources/edges.py +++ b/vmware_nsx/shell/admin/plugins/nsxv/resources/edges.py @@ -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'],