Merge pull request ceph#91 from Youscribe/defaultweight

Set weight of an osd based on df.

Reviewed-by: Sage Weil <[email protected]>

src/upstart/ceph-osd.conf

@@ -21,14 +21,15 @@ pre-start script
         # command line, ceph.conf can override what it wants
 	location="$(ceph-conf --cluster=${cluster:-ceph} --name=osd.$id --lookup osd_crush_location || :)"
 	weight="$(ceph-conf --cluster=${cluster:-ceph} --name=osd.$id --lookup osd_crush_initial_weight || :)"
+	defaultweight=`df /var/lib/ceph/osd/${cluster:-ceph}-$id/ | tail -1 | awk '{ d= $2/1073741824 ; r = sprintf("%.2f", d); print r }'`
 	ceph \
             --cluster="${cluster:-ceph}" \
             --name="osd.$id" \
             --keyring="/var/lib/ceph/osd/${cluster:-ceph}-$id/keyring" \
             osd crush create-or-move \
 	    -- \
             "$id" \
-	    "${weight:-1}" \
+	    "${weight:-${defaultweight:-1}}" \
 	    root=default \
 	    host="$(hostname -s)" \
 	    $location \