]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
fix error on teardown failing to unmount /mnt
authorSam Lang <sam.lang@inktank.com>
Tue, 18 Sep 2012 22:56:08 +0000 (15:56 -0700)
committerSam Lang <sam.lang@inktank.com>
Tue, 18 Sep 2012 22:56:08 +0000 (15:56 -0700)
teuthology/task/ceph.py

index d70cc47e9b6fb05a9820571d5dfb75b30fae48e7..9dcc4a2b9ca63c006f80112cd8fde04f9770ce68 100644 (file)
@@ -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