From: Loic Dachary <loic@dachary.org>
Date: Mon, 30 Dec 2013 09:09:41 +0000 (+0100)
Subject: vstart: set fsid in [global]
X-Git-Tag: v0.75~17^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1018%2Fhead;p=ceph.git

vstart: set fsid in [global]

If not set, commands that rely on --show-config-value fsid or something
equivalent will fail. ceph-disk does, for instance and setting the fsid
in CEPH_ARGS won't help because it will be appended after
--show-config-value :

    CEPH_ARGS="--fsid 96a3abe6-7552-4635-a79b-f3c096ff8b95" ./ceph-mon --cluster=ceph --name=osd. --show_args --show-config-value fsid
    args: --cluster=ceph --name=osd. --show_args --show-config-value fsid --fsid 96a3abe6-7552-4635-a79b-f3c096ff8b95
    00000000-0000-0000-0000-000000000000

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index b79d7c1ad0f4..fe1c255d7333 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -322,6 +322,7 @@ if [ "$start_mon" -eq 1 ]; then
 		        cat <<EOF > $conf
 ; generated by vstart.sh on `date`
 [global]
+        fsid = $(uuidgen)
         osd pg bits = 3
         osd pgp bits = 5  ; (invalid, but ceph should cope!)
         osd crush chooseleaf type = 0