From: Zack Cerza <zack@redhat.com>
Date: Mon, 11 Jan 2016 19:42:08 +0000 (-0700)
Subject: Fix regression in flock usage
X-Git-Tag: 1.1.0~703^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F767%2Fhead;p=teuthology.git

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 4d2db668..ab10a300 100644
--- 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 " +