From: Dan Mick <dan.mick@redhat.com>
Date: Thu, 26 Mar 2015 22:31:05 +0000 (-0700)
Subject: calamari_setup: mounting iso on older distros requires -o loop
X-Git-Tag: v10.2.6~165^2^2~519^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5644bb5a8d4ecc3ce62e67b0e8703f5abb38a6b0;p=ceph.git

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 5bce5648e54..3ac1a5a5bd7 100644
--- 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