Merge "NSXv: Change edge_ha flag on edge updates"

This commit is contained in:
Jenkins 2015-11-25 14:07:30 +00:00 committed by Gerrit Code Review
commit f6260fda0e
1 changed files with 3 additions and 3 deletions

View File

@ -75,6 +75,9 @@ class EdgeApplianceDriver(object):
if datacenter_moid:
edge['datacenterMoid'] = datacenter_moid
if not dist and cfg.CONF.nsxv.edge_ha:
self._enable_high_availability(edge)
return edge
def _assemble_edge_appliance(self, resource_pool_id, datastore_id):
@ -506,9 +509,6 @@ class EdgeApplianceDriver(object):
if not dist and loadbalancer_enable:
self._enable_loadbalancer(edge)
if not dist and cfg.CONF.nsxv.edge_ha:
self._enable_high_availability(edge)
if async:
userdata = {
'dist': dist,