From fd8a7ede77fd2ae69ceac62aff73969b4d303bd9 Mon Sep 17 00:00:00 2001
From: linb <linb@vmware.com>
Date: Mon, 21 Mar 2016 13:59:36 +0800
Subject: [PATCH] Remove useless edge cluster uuid

Since we can get edge cluster and edge members info from
default_tier0_router_uuid, the default_edge_cluster_uuid is totally
useless. The patch removes all default edge cluster relative codes.

Change-Id: I9f9a7fdc1c4c8d67a22ef58564d749e53048ee18
u
---
 devstack/lib/vmware_nsx_v3  | 5 ++---
 etc/nsx.ini                 | 3 ---
 vmware_nsx/common/config.py | 2 --
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/devstack/lib/vmware_nsx_v3 b/devstack/lib/vmware_nsx_v3
index 53c0f54b53..2a9bfa7cbb 100644
--- a/devstack/lib/vmware_nsx_v3
+++ b/devstack/lib/vmware_nsx_v3
@@ -99,8 +99,8 @@ function _nsxv3_ini_set {
 function neutron_plugin_configure_service {
     _nsxv3_ini_set default_overlay_tz_uuid $DEFAULT_OVERLAY_TZ_UUID "The VMware NSX plugin won't work without a default transport zone."
     _nsxv3_ini_set default_vlan_tz_uuid $DEFAULT_VLAN_TZ_UUID
-    if [[ "$DEFAULT_EDGE_CLUSTER_UUID" != "" ]]; then
-        iniset /$Q_PLUGIN_CONF_FILE nsx_v3 default_edge_cluster_uuid $DEFAULT_EDGE_CLUSTER_UUID
+    if [[ "$DEFAULT_TIER0_ROUTER_UUID" != "" ]]; then
+        _nsxv3_ini_set default_tier0_router_uuid $DEFAULT_TIER0_ROUTER_UUID
         Q_L3_ENABLED=True
         Q_L3_ROUTER_PER_TENANT=True
     fi
@@ -115,7 +115,6 @@ function neutron_plugin_configure_service {
     if [[ "$NSX_L2GW_DRIVER" != "" ]]; then
         iniset /$Q_PLUGIN_CONF_FILE DEFAULT nsx_l2gw_driver $NSX_L2GW_DRIVER
     fi
-    _nsxv3_ini_set default_tier0_router_uuid $DEFAULT_TIER0_ROUTER_UUID
     _nsxv3_ini_set nsx_api_user $NSX_USER
     _nsxv3_ini_set nsx_api_password $NSX_PASSWORD
     _nsxv3_ini_set retries $NSX_RETRIES
diff --git a/etc/nsx.ini b/etc/nsx.ini
index 7946b610ec..d7a15957b8 100644
--- a/etc/nsx.ini
+++ b/etc/nsx.ini
@@ -338,9 +338,6 @@
 # Neutron networks, if no physical network has been specified
 # default_vlan_tz_uuid = afc40f8a-4967-477e-a17a-9d560d1786c7
 
-# Default Edge Cluster Identifier
-# default_edge_cluster_uuid = afc40f8a-4967-477e-a17a-9d560d1786c7
-
 # Maximum number of times to retry API requests upon stale revision errors.
 # retries = 10
 
diff --git a/vmware_nsx/common/config.py b/vmware_nsx/common/config.py
index 771b33b404..946846be3e 100644
--- a/vmware_nsx/common/config.py
+++ b/vmware_nsx/common/config.py
@@ -195,8 +195,6 @@ nsx_v3_opts = [
                       "zone that will be used for bridging between Neutron "
                       "networks. It needs to be created in NSX before "
                       "starting Neutron with the NSX plugin.")),
-    cfg.StrOpt('default_edge_cluster_uuid',
-               help=_("Default edge cluster identifier")),
     cfg.StrOpt('default_bridge_cluster_uuid',
                help=_("Default bridge cluster identifier for L2 gateway. "
                       "This needs to be created in NSX before using the L2 "