From: Dan Mick <dan.mick@redhat.com>
Date: Fri, 6 Feb 2015 01:23:58 +0000 (-0800)
Subject: tasks/calamari_setup: ice_setup 0.2.0 has added another prompt
X-Git-Tag: v11.1.1~58^2^2~712^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4b6fa9dbb4e598f1b52395ef699a132305ebe233;p=ceph.git

tasks/calamari_setup: ice_setup 0.2.0 has added another prompt

Add an extra '\n' to the interaction string to answer it

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/tasks/calamari_setup.py b/tasks/calamari_setup.py
index 08ecf0327e22..ae92b0b9f20c 100644
--- a/tasks/calamari_setup.py
+++ b/tasks/calamari_setup.py
@@ -249,7 +249,7 @@ def calamari_install(config, cal_svr):
                       run.Raw('|'), 'tar', 'xvf', run.Raw('-')])
     if ret.exitstatus:
         raise RuntimeError('remote tar failed')
-    icesetdata = 'yes\n%s\nhttp\n' % client_id
+    icesetdata = 'yes\n\n%s\nhttp\n' % client_id
     ice_in = StringIO(icesetdata)
     ice_setup_io = StringIO()
     ret = cal_svr.run(args=['sudo', 'python', 'ice_setup.py'], stdin=ice_in,