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 <sander.pool@inktank.com>
Signed-off-by: Sam Lang <sam.lang@inktank.com>

diff --git a/s3tests.py b/s3tests.py
index 6f4b984e7b1268fbe5d819a5a271f0d796ac8dc9..a52ccc723cb0c5eb61050a88b8abfa24b7e6579d 100644 (file)
--- 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 3518ee163bfc5d012cc724218c4284110a9e62b5..076509b2dd08f2854ecfa08261b3c8825835faf4 100644 (file)
--- 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)],