From c27c36332ce83ffe1d0da7c976b633d3601a0e0e Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Mon, 2 Mar 2015 16:35:25 -0800 Subject: [PATCH] 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 --- teuthology/nuke.py | 9 +++++++++ teuthology/task/install.py | 2 ++ 2 files changed, 11 insertions(+) diff --git a/teuthology/nuke.py b/teuthology/nuke.py index e36798c502..767ce476b9 100644 --- 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 59d8b8564a..26f9bb4660 100644 --- 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', ] -- 2.39.5