x/vmware-nsx
Code Issues Proposed changes

Ensure that lockfile are defined in a common place

Browse Source 
Fixes bug 1158146

Change-Id: I0e986eb16a7ec5b9972a37af583f697ba3624a80
This commit is contained in:
Gary Kotton 2013-03-21 04:19:05 +00:00
parent 9683664ff3
commit c6bf10d86c
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/quantum.conf
View File

@ -9,6 +9,9 @@
# user executing the agent. # user executing the agent.
# state_path = /var/lib/quantum # state_path = /var/lib/quantum
# Where to store lock files
lock_path = $state_path/lock
# log_format = %(asctime)s %(levelname)8s [%(name)s] %(message)s # log_format = %(asctime)s %(levelname)8s [%(name)s] %(message)s
# log_date_format = %Y-%m-%d %H:%M:%S # log_date_format = %Y-%m-%d %H:%M:%S

2
quantum/agent/linux/iptables_manager.py
View File

@ -41,8 +41,6 @@ binary_name = os.path.basename(inspect.stack()[-1][1])[:16]
MAX_CHAIN_LEN_WRAP = 11 MAX_CHAIN_LEN_WRAP = 11
MAX_CHAIN_LEN_NOWRAP = 28 MAX_CHAIN_LEN_NOWRAP = 28
cfg.CONF.set_default('lock_path', '$state_path/lock')
def get_chain_name(chain_name, wrap=True): def get_chain_name(chain_name, wrap=True):
if wrap: if wrap:

2
quantum/tests/etc/quantum.conf.test
View File

@ -20,6 +20,8 @@ api_paste_config = api-paste.ini.test
# The messaging module to use, defaults to kombu. # The messaging module to use, defaults to kombu.
rpc_backend = quantum.openstack.common.rpc.impl_fake rpc_backend = quantum.openstack.common.rpc.impl_fake
lock_path = $state_path/lock
[DATABASE] [DATABASE]
sql_connection = 'sqlite:///:memory:' sql_connection = 'sqlite:///:memory:'