Make rejoin-stack.sh start screen in detached mode

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

diff --git a/teuthology/task/devstack.py b/teuthology/task/devstack.py
index 2ed95bfd8b8bc915369b34b2c4511915e8b83263..f4d164c452b3d34ae84dc3a5122b2b74e1ed7c8b 100644 (file)
--- a/teuthology/task/devstack.py
+++ b/teuthology/task/devstack.py
@@ -261,7 +261,12 @@ def reboot(node, timeout=300, interval=30):
 
 
 def start_devstack(devstack_node):
-    log.info("Starting devstack...")
+    log.info("Patching devstack start script...")
+    # This causes screen to start headless - otherwise rejoin-stack.sh fails
+    # because there is no terminal attached.
+    cmd = "cd devstack && sed -ie 's/screen -c/screen -dm -c/' rejoin-stack.sh"
+    devstack_node.run(args=cmd)
 
-    args = ['cd', 'devstack', run.Raw('&&'), './rejoin-stack.sh']
-    devstack_node.run(args=args)
+    log.info("Starting devstack...")
+    cmd = "cd devstack && ./rejoin-stack.sh"
+    devstack_node.run(args=cmd)