ceph: pass ceph.conf to osdmaptool

This ensure it sees the chooseleaf option and generates the proper
CRUSH rules.

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index 2edf238df44e7740e35ca0fea9fb9a89d855867a..2a0b0fd6383b54eef159ffbbf5abe522402f1c53 100644 (file)
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -493,6 +493,8 @@ def cluster(ctx, config):
                 '/tmp/cephtest/binary/usr/local/bin/ceph-coverage',
                 coverage_dir,
                 '/tmp/cephtest/binary/usr/local/bin/osdmaptool',
+                '-c',
+                '/tmp/cephtest/ceph.conf',
                 '--clobber',
                 '--createsimple', '{num:d}'.format(
                     num=teuthology.num_instances_of_type(ctx.cluster, 'osd'),