vstart.sh: use new-style section names in config

Use new-style section names in vstart.sh.
Also update sample.ceph.conf.

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/sample.ceph.conf b/src/sample.ceph.conf
index bb874e778cf004bdaef27f5ccb48d1d6c937d021..473114b3de7ecc610235ba6e96a4b27244056328 100644 (file)
--- a/src/sample.ceph.conf
+++ b/src/sample.ceph.conf
@@ -37,15 +37,15 @@
        ;debug paxos = 20
        ;debug auth = 20
 
-[mon0]
+[mon.0]
        host = alpha
        mon addr = 192.168.0.10:6789
 
-[mon1]
+[mon.1]
        host = beta
        mon addr = 192.168.0.11:6789
 
-[mon2]
+[mon.2]
        host = gamma
        mon addr = 192.168.0.12:6789
 
@@ -89,7 +89,7 @@
        ;debug filestore = 20
        ;debug journal = 20
 
-[osd0]
+[osd.0]
        host = delta
 
        ; if 'btrfs devs' is not specified, you're responsible for
@@ -98,14 +98,14 @@
        ; usually fine for basic testing).
        btrfs devs = /dev/sdx
 
-[osd1]
+[osd.1]
        host = epsilon
        btrfs devs = /dev/sdy
 
-[osd2]
+[osd.2]
        host = zeta
        btrfs devs = /dev/sdx
 
-[osd3]
+[osd.3]
        host = eta
        btrfs devs = /dev/sdy

diff --git a/src/vstart.sh b/src/vstart.sh
index 90770e2b3f75333ac491b30e96a57aad258abfff..c357d3735af495f6130b2edf8bc1568431673527 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -368,7 +368,7 @@ if [ "$start_osd" -eq 1 ]; then
        if [ "$new" -eq 1 ]; then
            if [ $overwrite_conf -eq 1 ]; then
                    cat <<EOF >> $conf
-[osd$osd]
+[osd.$osd]
         osd data = dev/osd$osd
         osd journal = dev/osd$osd/journal
         osd journal size = 100