From c6bf10d86c2b2d8f66fc07183b9300fb99a89ba5 Mon Sep 17 00:00:00 2001
From: Gary Kotton <gkotton@redhat.com>
Date: Thu, 21 Mar 2013 04:19:05 +0000
Subject: [PATCH] Ensure that lockfile are defined in a common place

Fixes bug 1158146

Change-Id: I0e986eb16a7ec5b9972a37af583f697ba3624a80
---
 etc/quantum.conf                        | 3 +++
 quantum/agent/linux/iptables_manager.py | 2 --
 quantum/tests/etc/quantum.conf.test     | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/etc/quantum.conf b/etc/quantum.conf
index 89005b6363d..904cbab6471 100644
--- 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 4d6de265737..13774b5c061 100644
--- 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 60b3728fc57..cedeb3c2788 100644
--- 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:'