Ensure that lockfile are defined in a common place

Fixes bug 1158146

Change-Id: I0e986eb16a7ec5b9972a37af583f697ba3624a80

diff --git a/etc/quantum.conf b/etc/quantum.conf
index 89005b6363d52315a7d28b057786db826ec3308d..904cbab647195f86afdece5b06e4e7847c4684e2 100644 (file)
--- a/etc/quantum.conf
+++ b/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
 

diff --git a/quantum/agent/linux/iptables_manager.py b/quantum/agent/linux/iptables_manager.py
index 4d6de265737ec3c6bded05872a171dfc2b48e77f..13774b5c06147716db66b0502afb712fcbee55c4 100644 (file)
--- a/quantum/agent/linux/iptables_manager.py
+++ b/quantum/agent/linux/iptables_manager.py
@@ -41,8 +41,6 @@ binary_name = os.path.basename(inspect.stack()[-1][1])[:16]
 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:

diff --git a/quantum/tests/etc/quantum.conf.test b/quantum/tests/etc/quantum.conf.test
index 60b3728fc57fc659f323e77ae583dc012ea7edcb..cedeb3c2788e5dd188f95325106b8596365aa355 100644 (file)
--- a/quantum/tests/etc/quantum.conf.test
+++ b/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:'