From daad53fc4fe27339febe1376d5a7221e933f3cd3 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 5 Mar 2013 14:14:12 -0800 Subject: [PATCH] ceph-fuse: install via install.py Signed-off-by: Sage Weil --- teuthology/task/ceph-fuse.py | 12 ------------ teuthology/task/install.py | 2 ++ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/teuthology/task/ceph-fuse.py b/teuthology/task/ceph-fuse.py index 3943091c88c05..26b2dd5ba19c6 100644 --- a/teuthology/task/ceph-fuse.py +++ b/teuthology/task/ceph-fuse.py @@ -4,7 +4,6 @@ import os from teuthology import misc as teuthology from ..orchestra import run -from teuthology.task import install as install_task log = logging.getLogger(__name__) @@ -66,16 +65,8 @@ def task(ctx, config): log.info("Client client.%s config is %s" % (id_, client_config)) daemon_signal = 'kill' - flavor = 'basic' if client_config.get('coverage') or client_config.get('valgrind') is not None: daemon_signal = 'term' - flavor='notcmalloc' - - # install ceph fuse package - install_task.install_debs(ctx, - ['ceph-fuse', 'ceph-fuse-dbg'], - {'branch': config.get('branch', 'master'), - 'flavor': flavor}) mnt = os.path.join(testdir, 'mnt.{id}'.format(id=id_)) log.info('Mounting ceph-fuse client.{id} at {remote} {mnt}...'.format( @@ -181,6 +172,3 @@ def task(ctx, config): mnt, ], ) - - # remove ceph-fuse package - install_task.remove_debs(ctx, ['ceph-fuse']) diff --git a/teuthology/task/install.py b/teuthology/task/install.py index 3f818667b3a53..a164519ae272b 100644 --- a/teuthology/task/install.py +++ b/teuthology/task/install.py @@ -197,6 +197,8 @@ def install(ctx, config): 'ceph-mds-dbg', 'ceph-common', 'ceph-common-dbg', + 'ceph-fuse', + 'ceph-fuse-dbg', 'ceph-test', 'ceph-test-dbg', 'radosgw', -- 2.39.5