x/vmware-nsx
Code Issues Proposed changes

Merge "Remove useless edge cluster uuid"

Browse Source
This commit is contained in:
Jenkins 2016-03-21 10:04:07 +00:00 committed by Gerrit Code Review
commit f68f742428
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/lib/vmware_nsx_v3
View File

@ -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

3
etc/nsx.ini
View File

@ -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

2
vmware_nsx/common/config.py
View File

@ -196,8 +196,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 "