update sources to 12.2.2

[ceph.git] / ceph / src / vstart.sh

diff --git a/ceph/src/vstart.sh b/ceph/src/vstart.sh
index 82ec76bf94ee49b1bac36894a54815cbc14f5126..63f2202cb479b9f5b3ac514f9af461873c86ef5e 100755 (executable)
--- a/ceph/src/vstart.sh
+++ b/ceph/src/vstart.sh
@@ -507,8 +507,10 @@ $DAEMONOPTS
         osd copyfrom max chunk = 524288
         bluestore fsck on mount = true
         bluestore block create = true
+       bluestore block db path = $CEPH_DEV_DIR/osd\$id/block.db.file
         bluestore block db size = 67108864
         bluestore block db create = true
+       bluestore block wal path = $CEPH_DEV_DIR/osd\$id/block.wal.file
         bluestore block wal size = 1048576000
         bluestore block wal create = true
 $COSDDEBUG
@@ -516,7 +518,7 @@ $COSDMEMSTORE
 $COSDSHORT
 $extra_conf
 [mon]
-        mgr initial modules = restful status dashboard
+        mgr initial modules = restful status dashboard balancer
         mon pg warn min per osd = 3
         mon osd allow primary affinity = true
         mon reweight min pgs per osd = 4
@@ -627,9 +629,14 @@ EOF
             echo "add osd$osd $uuid"
             ceph_adm osd create $uuid
             ceph_adm osd crush add osd.$osd 1.0 host=$HOSTNAME root=default
-            $SUDO $CEPH_BIN/ceph-osd -i $osd $ARGS --mkfs --mkkey --osd-uuid $uuid
+           OSD_SECRET=$($CEPH_BIN/ceph-authtool --gen-print-key)
+            $SUDO $CEPH_BIN/ceph-osd -i $osd $ARGS --mkfs --key $OSD_SECRET --osd-uuid $uuid
 
             local key_fn=$CEPH_DEV_DIR/osd$osd/keyring
+           cat > $key_fn<<EOF
+[osd.$osd]
+       key = $OSD_SECRET
+EOF
             echo adding osd$osd key to auth repository
             ceph_adm -i "$key_fn" auth add osd.$osd osd "allow *" mon "allow profile osd" mgr "allow profile osd"
         fi
@@ -776,6 +783,7 @@ else
         debug rocksdb = 10
         debug bdev = 20
         debug rgw = 20
+       debug reserver = 10
         debug objclass = 20'
     CMDSDEBUG='
         debug ms = 1