From: Zack Cerza Date: Tue, 11 Feb 2014 01:22:57 +0000 (-0600) Subject: Make rejoin-stack.sh start screen in detached mode X-Git-Tag: 1.1.0~1646^2~22 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e73df9c853bdfb7196d8bb73b0bfa900dbec6050;p=teuthology.git Make rejoin-stack.sh start screen in detached mode Signed-off-by: Zack Cerza --- diff --git a/teuthology/task/devstack.py b/teuthology/task/devstack.py index 2ed95bfd8..f4d164c45 100644 --- 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)