summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-29 18:27:03 +0000
committerGerrit Code Review <review@openstack.org>2016-02-29 18:27:03 +0000
commit7cd7883936c1594e0daa236386e423e1c70bcf10 (patch)
tree2bc4d4d59211350a0996e1a9553c88042f00784f
parent5ee71e0acfa2475d318c993f7940d4139d8c3f86 (diff)
parent499d5aa36d352cf3bfc163cd90e445acc4dd2a16 (diff)
downloadoslo-concurrency-7cd7883936c1594e0daa236386e423e1c70bcf10.tar.gz
Merge "Revert "Use tempfile.tempdir for lock_path if OSLO_LOCK_PATH is not set""
-rw-r--r--oslo_concurrency/lockutils.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/oslo_concurrency/lockutils.py b/oslo_concurrency/lockutils.py
index 227af59..2e61ff3 100644
--- a/oslo_concurrency/lockutils.py
+++ b/oslo_concurrency/lockutils.py
@@ -41,14 +41,11 @@ _opts = [
help='Enables or disables inter-process locks.',
deprecated_group='DEFAULT'),
cfg.StrOpt('lock_path',
- default=os.environ.get("OSLO_LOCK_PATH", tempfile.gettempdir()),
+ default=os.environ.get("OSLO_LOCK_PATH"),
help='Directory to use for lock files. For security, the '
'specified directory should only be writable by the user '
'running the processes that need locking. '
'Defaults to environment variable OSLO_LOCK_PATH. '
- 'If OSLO_LOCK_PATH is not set in the environment, use the '
- 'Python tempfile.gettempdir function to find a suitable '
- 'location. '
'If external locks are used, a lock path must be set.',
deprecated_group='DEFAULT')
]