]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
nuke: reboot if rbd is mounted
authorJosh Durgin <josh.durgin@dreamhost.com>
Thu, 1 Sep 2011 02:46:10 +0000 (19:46 -0700)
committerJosh Durgin <josh.durgin@dreamhost.com>
Thu, 1 Sep 2011 02:46:10 +0000 (19:46 -0700)
teuthology/nuke.py

index 0c2f641de59a45478487ed324a965592c9947043..6ceb0f228b231e783ee1dcd5689b818fa73eb48b 100644 (file)
@@ -84,7 +84,9 @@ def find_kernel_mounts(ctx, log):
     for remote in ctx.cluster.remotes.iterkeys():
         proc = remote.run(
             args=[
-                'grep', '-q', " ceph " , '/etc/mtab'
+                'grep', '-q', ' ceph ' , '/etc/mtab',
+                run.Raw('||'),
+                'grep', '-q', '^/dev/rbd' , '/etc/mtab',
                 ],
             wait=False,
             )