]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
workunits: set CEPH_CONF environment
authorSage Weil <sage@newdream.net>
Mon, 22 Aug 2011 00:26:15 +0000 (17:26 -0700)
committerSage Weil <sage@newdream.net>
Mon, 22 Aug 2011 00:26:15 +0000 (17:26 -0700)
This allows any ceph util we run (including the rados-api tests) find
the config and keyrings they need.

teuthology/task/workunit.py

index 10fc6003870f62850e21f2412d7d88165c1127f0..1361653113bf2c4cfa677ba254eacd33cbbd9836 100644 (file)
@@ -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,