Merge "Revert "Use tempfile.tempdir for lock_path if OSLO_LOCK_PATH is not set""

This commit is contained in:
Jenkins 2016-02-29 18:27:03 +00:00 committed by Gerrit Code Review
commit 7cd7883936

View File

@ -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')
]