From: Sage Weil <sage@newdream.net>
Date: Mon, 22 Aug 2011 00:26:15 +0000 (-0700)
Subject: workunits: set CEPH_CONF environment
X-Git-Tag: 1.1.0~2847
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e79dda9a9dc34558aaab46ecda4bbb48e5dd8185;p=teuthology.git

workunits: set CEPH_CONF environment

This allows any ceph util we run (including the rados-api tests) find
the config and keyrings they need.
---

diff --git a/teuthology/task/workunit.py b/teuthology/task/workunit.py
index 10fc60038..136165311 100644
--- a/teuthology/task/workunit.py
+++ b/teuthology/task/workunit.py
@@ -113,7 +113,7 @@ def _run_tests(ctx, role, tests):
                         run.Raw('&&'),
                         run.Raw('PATH="$PATH:/tmp/cephtest/binary/usr/local/bin"'),
                         run.Raw('LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/tmp/cephtest/binary/usr/local/lib"'),
-                        run.Raw('CEPH_ARGS="-c /tmp/cephtest/ceph.conf"'),
+                        run.Raw('CEPH_CONF="/tmp/cephtest/ceph.conf"'),
                         '{srcdir}/{workunit}'.format(
                             srcdir=srcdir,
                             workunit=workunit,