diff options
| author | Sage Weil <sage@inktank.com> | 2013-05-08 14:35:54 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-05-08 14:36:22 -0700 |
| commit | ee3da880fbc0488467c30b1d0b635e3c50e23cc3 (patch) | |
| tree | f29df8548dea61786e912c18dcc06f1b33a0c933 | |
| parent | 4848fac24224879bcdc4fcf202d6ab689d8d990f (diff) | |
| download | ceph-ee3da880fbc0488467c30b1d0b635e3c50e23cc3.tar.gz | |
init-ceph: fix osd_data location when checking df utilization
Do not assume default osd data location.
Fixes: #4951
Backport: cuttlefish, bobtail
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Gary Lowelll <gary.lowell@inktank.com>
(cherry picked from commit f2a54cc9c98a9f31aef049c74ea932b2d9000d3c)
| -rw-r--r-- | src/init-ceph.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/init-ceph.in b/src/init-ceph.in index 57ae19b11e1..a9ee60b3280 100644 --- a/src/init-ceph.in +++ b/src/init-ceph.in @@ -310,8 +310,8 @@ for name in $what; do # command line, ceph.conf can override what it wants get_conf osd_location "" "osd crush location" get_conf osd_weight "" "osd crush initial weight" - defaultweight=`df /var/lib/ceph/osd/ceph-$id/ | tail -1 | awk '{ d= $2/1073741824 ; r = sprintf("%.2f", d); print r }'` - get_conf osd_keyring "/var/lib/ceph/osd/ceph-$id/keyring" "keyring" + defaultweight=`df $osd_data/. | tail -1 | awk '{ d= $2/1073741824 ; r = sprintf("%.2f", d); print r }'` + get_conf osd_keyring "$osd_data/keyring" "keyring" $BINDIR/ceph \ --name="osd.$id" \ --keyring="$osd_keyring" \ |