From: Sage Weil <sage.weil@dreamhost.com>
Date: Fri, 27 May 2011 04:37:03 +0000 (-0700)
Subject: mkcephfs: pass config to osdmaptool
X-Git-Tag: v0.29~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=574b58f389d9988147912a4271417348d2e2c20a;p=ceph.git

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 c8c53d693aa..ff9f0d63b4b 100644
--- 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 96c72edaa5c..6c316669757 100755
--- 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