From: Zack Cerza <zack@cerza.org>
Date: Tue, 10 Jun 2014 19:40:37 +0000 (-0500)
Subject: Automatically watch 'multi' tube if tube_name
X-Git-Tag: 1.1.0~1406
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f69f2dffa99b2b864b2ce7add8b643210da7657d;p=teuthology.git

Automatically watch 'multi' tube if tube_name

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

diff --git a/teuthology/beanstalk.py b/teuthology/beanstalk.py
index 7eee0c1adf..1c2b60ccc7 100644
--- a/teuthology/beanstalk.py
+++ b/teuthology/beanstalk.py
@@ -21,6 +21,9 @@ def connect():
 
 
 def watch_tube(connection, tube_name):
+    if ',' in tube_name:
+        log.debug("Correcting tube name to 'multi'")
+        tube_name = 'multi'
     connection.watch(tube_name)
     connection.ignore('default')