From: Jason Kölker <jason@koelker.net>
Date: Mon, 28 Jan 2013 23:06:11 +0000 (-0600)
Subject: Set default lock_path in state_path
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d5bfd9106148eec91f1109ea7f88b6fb41cd69d5;p=openstack-build%2Fneutron-build.git

Set default lock_path in state_path

* Set the default lock_path to be within quantum's state_path
* Fixes bug 1107950

Change-Id: I346d6088d773b508b4a7ba925fdc91fd4f5bf160
---

diff --git a/quantum/agent/linux/iptables_manager.py b/quantum/agent/linux/iptables_manager.py
index 835fc36e4..67942bed7 100644
--- a/quantum/agent/linux/iptables_manager.py
+++ b/quantum/agent/linux/iptables_manager.py
@@ -25,6 +25,7 @@ import inspect
 import os
 
 from quantum.agent.linux import utils
+from quantum.openstack.common import cfg
 from quantum.openstack.common import lockutils
 from quantum.openstack.common import log as logging
 
@@ -34,6 +35,7 @@ LOG = logging.getLogger(__name__)
 #             so we limit it to 16 characters.
 #             (max_chain_name_length - len('-POSTROUTING') == 16)
 binary_name = os.path.basename(inspect.stack()[-1][1])[:16]
+cfg.CONF.set_default('lock_path', '$state_path/lock')
 
 
 class IptablesRule(object):