calamari_setup: mounting iso on older distros requires -o loop

Ubuntu's mount/kernel support "mount <file> <mntpnt>" directly;
apparently Centos 6 (and presumably RHEL6) require specifying at
least '-o loop' (a /dev/loopN will be dynamically allocated and removed
on unmount).

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

diff --git a/tasks/calamari_setup.py b/tasks/calamari_setup.py
index 5bce5648e54c7ce9d6d8c3daa90b60633e8fe19a..3ac1a5a5bd7c9ed67aadd1f9fa3db8173c2a96e9 100644 (file)
--- a/tasks/calamari_setup.py
+++ b/tasks/calamari_setup.py
@@ -294,7 +294,8 @@ def calamari_install(config, cal_svr):
     elif icetype == 'iso':
         mountpoint = '/mnt/'   # XXX create?
         ret = cal_svr.run(
-            args=['sudo', 'mount', '-r', remote_iceball_file, mountpoint]
+            args=['sudo', 'mount', '-o', 'loop', '-r',
+                  remote_iceball_file, mountpoint]
         )
 
     # install ice_setup package