Skip to content
Browse files

Ensure that lockfile are defined in a common place

Fixes bug 1158146

Change-Id: I0e986eb16a7ec5b9972a37af583f697ba3624a80
  • Loading branch information...
1 parent 9683664 commit c6bf10d86c2b2d8f66fc07183b9300fb99a89ba5 Gary Kotton committed
Showing with 5 additions and 2 deletions.
  1. +3 −0 etc/quantum.conf
  2. +0 −2 quantum/agent/linux/iptables_manager.py
  3. +2 −0 quantum/tests/etc/quantum.conf.test
View
3 etc/quantum.conf
@@ -9,6 +9,9 @@
# user executing the agent.
# 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_date_format = %Y-%m-%d %H:%M:%S
View
2 quantum/agent/linux/iptables_manager.py
@@ -41,8 +41,6 @@
MAX_CHAIN_LEN_WRAP = 11
MAX_CHAIN_LEN_NOWRAP = 28
-cfg.CONF.set_default('lock_path', '$state_path/lock')
-
def get_chain_name(chain_name, wrap=True):
if wrap:
View
2 quantum/tests/etc/quantum.conf.test
@@ -20,6 +20,8 @@ api_paste_config = api-paste.ini.test
# The messaging module to use, defaults to kombu.
rpc_backend = quantum.openstack.common.rpc.impl_fake
+lock_path = $state_path/lock
+
[DATABASE]
sql_connection = 'sqlite:///:memory:'

0 comments on commit c6bf10d

Please sign in to comment.
Something went wrong with that request. Please try again.