mkcephfs: pass config to osdmaptool

This lets OSDMap::create_simple() see g_conf.osd_pool_default_size when
creating the initial data, metadata, and rbd pools.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index c8c53d693aa7f25cf4025709214a33686fa61058..ff9f0d63b4b6d69c7bc0fe8a44e6f90e162dc68f 100644 (file)
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -339,7 +339,7 @@ if [ $preparemon -eq 1 ]; then
        fi
        echo " num osd = $numosd"
 
-       $BINDIR/osdmaptool --createsimple $numosd $dir/osdmap
+       $BINDIR/osdmaptool --createsimple $numosd $dir/osdmap -c ceph.conf
     fi
 
     # import crush map?

diff --git a/src/vstart.sh b/src/vstart.sh
index 96c72edaa5c78266df15fefb718e2b7999c0b934..6c31666975794a5917e60c53c9e2bbcec731ea5c 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -259,7 +259,7 @@ DAEMONOPTS="
 if [ "$start_mon" -eq 1 ]; then
        if [ "$new" -eq 1 ]; then
        # build and inject an initial osd map
-               $CEPH_BIN/osdmaptool --clobber --createsimple $CEPH_NUM_OSD $osdmap_fn --pg_bits 2 --pgp_bits 4
+               $CEPH_BIN/osdmaptool --clobber --createsimple $CEPH_NUM_OSD $osdmap_fn --pg_bits 2 --pgp_bits 4 -c $conf
        fi
 
        if [ "$new" -eq 1 ]; then