Merge "Deploy NSX Edges in HA mode"

devstack/lib/vmware_nsx_v

@@ -98,6 +98,7 @@ function neutron_plugin_configure_service {
     _nsxv_ini_set nova_metadata_port "$NSXV_NOVA_METADATA_PORT"
     _nsxv_ini_set nova_metadata_ips "$NSXV_NOVA_METADATA_IPS"
     _nsxv_ini_set metadata_shared_secret "$NSXV_METADATA_SHARED_SECRET"
+    _nsxv_ini_set edge_ha "$NSXV_EDGE_HA"
 }
 
 function neutron_plugin_setup_interface_driver {

vmware_nsx/etc/nsx.ini

@@ -137,6 +137,8 @@
 # port-security feature.
 # spoofguard_enabled = True
 
+# (Optional) Deploys NSX Edges in HA mode
+# edge_ha = True
 # (ListOpt) Ordered list of router_types to allocate as tenant routers.
 # It limits the router types that the Nsxv can support for tenants:
 # distributed: router is supported by distributed edge at the backend.

vmware_nsx/neutron/plugins/vmware/common/config.py

@@ -302,6 +302,9 @@ nsxv_opts = [
                 default=True,
                 help=_("If True, the server instance will attempt to "
                        "initialize the metadata infrastructure")),
+    cfg.BoolOpt('edge_ha',
+                default=True,
+                help=_("Enable HA for NSX Edges"))
 ]
 
 # Register the configuration options

vmware_nsx/neutron/plugins/vmware/vshield/edge_appliance_driver.py

@@ -177,13 +177,21 @@ class EdgeApplianceDriver(object):
         return status_level
 
     def _enable_loadbalancer(self, edge):
-        if not edge.get('featureConfigs') or (
+        if (not edge.get('featureConfigs') or
             not edge['featureConfigs'].get('features')):
             edge['featureConfigs'] = {'features': []}
         edge['featureConfigs']['features'].append(
             {'featureType': 'loadbalancer_4.0',
              'enabled': True})
 
+    def _enable_high_availability(self, edge):
+        if (not edge.get('featureConfigs') or
+            not edge['featureConfigs'].get('features')):
+            edge['featureConfigs'] = {'features': []}
+        edge['featureConfigs']['features'].append(
+            {'featureType': 'highavailability_4.0',
+             'enabled': True})
+
     def get_edge_status(self, edge_id):
         try:
             response = self.vcns.get_edge_status(edge_id)[1]
@@ -498,6 +506,9 @@ 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,