From: Sam Lang <sam.lang@inktank.com>
Date: Tue, 18 Sep 2012 22:56:08 +0000 (-0700)
Subject: fix error on teardown failing to unmount /mnt
X-Git-Tag: 1.1.0~2450
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5ce4d70e4be791d29ef32fd34d9f929cbd3e99a7;p=teuthology.git

fix error on teardown failing to unmount /mnt
---

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index d70cc47e9..9dcc4a2b9 100644
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -773,11 +773,13 @@ def cluster(ctx, config):
                         ]
                     )
 
-        for remote, roles_for_host in osds.remotes.iteritems():
-            remote.run(
-                args=[ 'sudo', 'umount', '-f', '/mnt' ],
-                check_status=False,
-            )
+        if config.get('tmpfs_journal'):
+            log.info('tmpfs journal enabled - unmounting tmpfs at /mnt')
+	    for remote, roles_for_host in osds.remotes.iteritems():
+                remote.run(
+                    args=[ 'sudo', 'umount', '-f', '/mnt' ],
+                    check_status=False,
+                )
 
         if ctx.archive is not None:
             # archive mon data, too