install/nuke: add rbd-fuse package

This is now used by rbd's merge_diff test. rbd-fuse has been around
since before dumpling, so this is compatible with all current ceph
testing.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>

diff --git a/teuthology/nuke.py b/teuthology/nuke.py
index e36798c50242e6dcfda6f784af6328aca463d907..767ce476b990dfb66334fe0689d56f60f6806f26 100644 (file)
--- a/teuthology/nuke.py
+++ b/teuthology/nuke.py
@@ -55,6 +55,14 @@ def shutdown_daemons(ctx):
                 'xargs', '-n', '1', 'sudo', 'fusermount', '-u', run.Raw(';'),
                 'fi',
                 run.Raw(';'),
+                'if', 'grep', '-q', 'rbd-fuse', '/etc/mtab', run.Raw(';'),
+                'then',
+                'grep', 'rbd-fuse', '/etc/mtab', run.Raw('|'),
+                'grep', '-o', " /.* fuse", run.Raw('|'),
+                'grep', '-o', "/.* ", run.Raw('|'),
+                'xargs', '-n', '1', 'sudo', 'fusermount', '-u', run.Raw(';'),
+                'fi',
+                run.Raw(';'),
                 'sudo',
                 'killall',
                 '--quiet',
@@ -66,6 +74,7 @@ def shutdown_daemons(ctx):
                 'radosgw',
                 'ceph_test_rados',
                 'rados',
+                'rbd-fuse',
                 'apache2',
                 run.Raw('||'),
                 'true',  # ignore errors from ceph binaries not being found

diff --git a/teuthology/task/install.py b/teuthology/task/install.py
index 59d8b8564ae0aa048c8a44a58b9283f14c5d8577..26f9bb466022bf690cba6ff9138ae959500beba6 100644 (file)
--- a/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@ -45,6 +45,7 @@ PACKAGES['ceph']['deb'] = [
     'librados2-dbg',
     'librbd1',
     'librbd1-dbg',
+    'rbd-fuse',
 ]
 PACKAGES['ceph']['rpm'] = [
     'ceph-debuginfo',
@@ -60,6 +61,7 @@ PACKAGES['ceph']['rpm'] = [
     'librados2',
     'librbd1',
     'python-ceph',
+    'rbd-fuse',
 ]