From fa1f89478a76373cb33cf2524e2ebf68b3cd622c Mon Sep 17 00:00:00 2001 From: Sander Pool Date: Wed, 6 Feb 2013 19:16:52 +0000 Subject: [PATCH] Install ceph debs and use installed debs The ceph task installs ceph using the debian packages now, and all invocations of binaries installed in {tmpdir}/binary/usr/local/bin/ are replace with the use of the binaries installed in standard locations by the debs. Author: Sander Pool Signed-off-by: Sam Lang --- s3tests.py | 6 ++---- swift.py | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/s3tests.py b/s3tests.py index 6f4b984e7b1..a52ccc723cb 100644 --- a/s3tests.py +++ b/s3tests.py @@ -75,12 +75,10 @@ def do_create_users(ctx, config): _config_user(s3tests_conf, section, '{user}.{client}'.format(user=user, client=client)) ctx.cluster.only(client).run( args=[ - 'LD_LIBRARY_PATH={tdir}/binary/usr/local/lib'.format(tdir=testdir), '{tdir}/enable-coredump'.format(tdir=testdir), - '{tdir}/binary/usr/local/bin/ceph-coverage'.format(tdir=testdir), + 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), - '{tdir}/binary/usr/local/bin/radosgw-admin'.format(tdir=testdir), - '-c', '{tdir}/ceph.conf'.format(tdir=testdir), + 'radosgw-admin', 'user', 'create', '--uid', s3tests_conf[section]['user_id'], '--display-name', s3tests_conf[section]['display_name'], diff --git a/swift.py b/swift.py index 3518ee163bf..076509b2dd0 100644 --- a/swift.py +++ b/swift.py @@ -57,12 +57,10 @@ def create_users(ctx, config): _config_user(testswift_conf, '{user}.{client}'.format(user=user, client=client), user, suffix) ctx.cluster.only(client).run( args=[ - 'LD_LIBRARY_PATH={tdir}/binary/usr/local/lib'.format(tdir=testdir), '{tdir}/enable-coredump'.format(tdir=testdir), - '{tdir}/binary/usr/local/bin/ceph-coverage'.format(tdir=testdir), + 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), - '{tdir}/binary/usr/local/bin/radosgw-admin'.format(tdir=testdir), - '-c', '{tdir}/ceph.conf'.format(tdir=testdir), + 'radosgw-admin', 'user', 'create', '--subuser', '{account}:{user}'.format(account=testswift_conf['func_test']['account{s}'.format(s=suffix)],user=user), '--display-name', testswift_conf['func_test']['display_name{s}'.format(s=suffix)], -- 2.39.5