Fix regression in flock usage

Bug report: http://tracker.ceph.com/issues/14336
Regression caused in: https://github.com/ceph/teuthology/pull/764

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/provision.py b/teuthology/provision.py
index 4d2db6684672e3c7c8e32c1561b76d920e58d091..ab10a300a593526f8b8cd1b8965ed440b8a7f57f 100644 (file)
--- a/teuthology/provision.py
+++ b/teuthology/provision.py
@@ -307,7 +307,7 @@ class ProvisionOpenStack(OpenStack):
             net = ''
         flavor = self.flavor(resources_hint['machine'],
                              config['openstack'].get('flavor-select-regexp'))
-        misc.sh("flock --close /tmp/teuthology-server-create.lock --timeout 28800" +
+        misc.sh("flock --close --timeout 28800 /tmp/teuthology-server-create.lock" +
                 " openstack server create" +
                 " " + config['openstack'].get('server-create', '') +
                 " -f json " +