lockfile.FileLock already appends .lock

Otherwise you end up with files like nova-iptables.lock.lock

Change-Id: Ia7dd82c3721f89d438c1266e7ec3535a0d89334e

diff --git a/nova/utils.py b/nova/utils.py
index 791c63167d78ea289e0a02bf846c2eca8a4255ca..11e78ee5b64cb4e8c79c39e3f21b1ead7de17aee 100644 (file)
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -826,7 +826,7 @@ def synchronized(name, external=False):
                                 'method "%(method)s"...' %
                                 {'lock': name, 'method': f.__name__}))
                     lock_file_path = os.path.join(FLAGS.lock_path,
-                                                  'nova-%s.lock' % name)
+                                                  'nova-%s' % name)
                     lock = lockfile.FileLock(lock_file_path)
                 else:
                     lock = _NoopContextManager()