x/vmware-nsx
Code Issues Proposed changes

Move 'locking_coordinator_url' to common configuration section

Browse Source 
The variable will now be in the 'DEFAULT' section. This is due to the
fact that it is used by the NSX|V and NSX|V3 plugins.

DocImpact

Change-Id: I3238eafcf2fde0cb4fa6cd48099908980c28d39f
This commit is contained in:
Gary Kotton 2015-10-18 05:19:25 -07:00
parent 5b8e132cfb
commit 7be0400365
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etc/nsx.ini
View File

@ -48,6 +48,12 @@
# This field will be used when a L2 Gateway service plugin is configured. # This field will be used when a L2 Gateway service plugin is configured.
# nsx_l2gw_driver = # nsx_l2gw_driver =
# (Optional) URL for distributed locking coordination resource for lock manager
# This value is passed as a parameter to tooz coordinator.
# By default, value is None and oslo_concurrency is used for single-node
# lock management.
# locking_coordinator_url =
[quotas] [quotas]
# number of network gateways allowed per tenant, -1 means unlimited # number of network gateways allowed per tenant, -1 means unlimited
# quota_network_gateway = 5 # quota_network_gateway = 5
@ -171,12 +177,6 @@
# (Optional) Password to configure for Edge appliance login # (Optional) Password to configure for Edge appliance login
# edge_appliance_password = # edge_appliance_password =
# (Optional) URL for distributed locking coordination resource for lock manager
# This value is passed as a parameter to tooz coordinator.
# By default, value is None and oslo_concurrency is used for single-node
# lock management.
# locking_coordinator_url =
# (Optional) DHCP lease time # (Optional) DHCP lease time
# dhcp_lease_time = 86400 # dhcp_lease_time = 86400

7
vmware_nsx/common/config.py
View File

@ -160,7 +160,10 @@ cluster_opts = [
nsx_common_opts = [ nsx_common_opts = [
cfg.StrOpt('nsx_l2gw_driver', cfg.StrOpt('nsx_l2gw_driver',
help=_("Class path for the L2 gateway backend driver")) help=_("Class path for the L2 gateway backend driver")),
cfg.StrOpt('locking_coordinator_url',
deprecated_group='nsxv',
help=_('A URL to a locking mechanism coordinator')),
] ]
nsx_v3_opts = [ nsx_v3_opts = [
@ -322,8 +325,6 @@ nsxv_opts = [
cfg.IntOpt('dhcp_lease_time', cfg.IntOpt('dhcp_lease_time',
default=86400, default=86400,
help=_('DHCP default lease time.')), help=_('DHCP default lease time.')),
cfg.StrOpt('locking_coordinator_url',
help=_('A URL to a locking mechanism coordinator')),
cfg.BoolOpt('metadata_initializer', cfg.BoolOpt('metadata_initializer',
default=True, default=True,
help=_("If True, the server instance will attempt to " help=_("If True, the server instance will attempt to "

4
vmware_nsx/common/locking.py
View File

@ -26,14 +26,14 @@ LOG = log.getLogger(__name__)
class LockManager: class LockManager:
_coordinator = None _coordinator = None
_coordinator_pid = None _coordinator_pid = None
_connect_string = cfg.CONF.nsxv.locking_coordinator_url _connect_string = cfg.CONF.locking_coordinator_url
def __init__(self): def __init__(self):
LOG.debug('LockManager initialized!') LOG.debug('LockManager initialized!')
@staticmethod @staticmethod
def get_lock(name, **kwargs): def get_lock(name, **kwargs):
if cfg.CONF.nsxv.locking_coordinator_url: if cfg.CONF.locking_coordinator_url:
return LockManager._get_lock_distributed(name) return LockManager._get_lock_distributed(name)
else: else:
# Ensure that external=True # Ensure that external=True