From: Zack Cerza <zack@redhat.com>
Date: Thu, 12 Feb 2015 17:03:44 +0000 (-0700)
Subject: Add optional description arg to unlock_one()
X-Git-Tag: 1.1.0~1007^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1c4b2df12f2c050151839209adfb0c41efd07830;p=teuthology.git

Add optional description arg to unlock_one()

It gets passed to the lock server.

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

diff --git a/teuthology/lock.py b/teuthology/lock.py
index 02a83e4434..3e011873a1 100644
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -427,13 +427,14 @@ def unlock_many(names, user):
     return response.ok
 
 
-def unlock_one(ctx, name, user=None):
+def unlock_one(ctx, name, user=None, description=None):
     if user is None:
         user = misc.get_user()
     name = misc.canonicalize_hostname(name, user=None)
-    if not provision.destroy_if_vm(ctx, name, user):
+    if not provision.destroy_if_vm(ctx, name, user, description):
         log.error('downburst destroy failed for %s', name)
-    request = dict(name=name, locked=False, locked_by=user, description=None)
+    request = dict(name=name, locked=False, locked_by=user,
+                   description=description)
     uri = os.path.join(config.lock_server, 'nodes', name, 'lock', '')
     response = requests.put(uri, json.dumps(request))
     success = response.ok