From 0026c004cb1609c39ad0a7e7c6e65b66f8a100d6 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Mon, 11 Jan 2016 12:42:08 -0700 Subject: [PATCH] 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 --- teuthology/provision.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teuthology/provision.py b/teuthology/provision.py index 4d2db66846..ab10a300a5 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 " + -- 2.39.5