calamari_setup.py: fix tarball installs

May be obsolete soon, but in tarballs, ice_setup is still a script

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

diff --git a/tasks/calamari_setup.py b/tasks/calamari_setup.py
index 858afd70cac9f066e1f4a540b011eacc7fce4a4a..645aaf11537ea274d7643a416f41a7a331aabb11 100644 (file)
--- a/tasks/calamari_setup.py
+++ b/tasks/calamari_setup.py
@@ -234,13 +234,14 @@ def calamari_install(config, cal_svr):
     icesetdata = 'yes\n\n%s\nhttp\n' % client_id
     ice_in = StringIO(icesetdata)
     ice_out = StringIO()
-    args = 'sudo ice_setup'
-    if icetype == 'iso':
-        args += ' -d /mnt'
+    if icetype == 'tarball':
+        args = 'sudo python ice_setup.py'
+    else:
+        args = 'sudo ice_setup -d /mnt'
     ret = cal_svr.run(args=args, stdin=ice_in, stdout=ice_out)
     log.debug(ice_out.getvalue())
     if ret.exitstatus:
-        raise RuntimeError('ice_setup.py failed')
+        raise RuntimeError('ice_setup failed')
 
     # Run calamari-ctl initialize.
     icesetdata = '%s\n%s\n%s\n%s\n' % (