summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-29 07:41:13 +0000
committerGerrit Code Review <review@openstack.org>2013-01-29 07:41:13 +0000
commit1f832d7c6f9c520d157bf282e9f5f01f4df04aef (patch)
treecc84ed393c7477c8671b5410a506250c70ea18cf /openstack
parent9e5046b3f946a8edfd6776a113c49ea0f03bac95 (diff)
parentfebbd005151e2ade521eed027a7d5372e6e3c0bc (diff)
downloadoslo-1f832d7c6f9c520d157bf282e9f5f01f4df04aef.tar.gz
oslo-1f832d7c6f9c520d157bf282e9f5f01f4df04aef.tar.xz
oslo-1f832d7c6f9c520d157bf282e9f5f01f4df04aef.zip
Merge "Default lockutils to using a tempdir"
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/lockutils.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/openstack/common/lockutils.py b/openstack/common/lockutils.py
index afd6d00..21115fd 100644
--- a/openstack/common/lockutils.py
+++ b/openstack/common/lockutils.py
@@ -39,9 +39,8 @@ util_opts = [
cfg.BoolOpt('disable_process_locking', default=False,
help='Whether to disable inter-process locks'),
cfg.StrOpt('lock_path',
- default=os.path.abspath(os.path.join(os.path.dirname(__file__),
- '../')),
- help='Directory to use for lock files')
+ help=('Directory to use for lock files. Default to a '
+ 'temp directory'))
]