write fsid to ceph.conf

2012-10-03 21:19:14 +13:00 · 2012-10-03 21:19:14 +13:00 · 75d8f0feef
parent f9de3aa4d8
commit 75d8f0feef
3 changed files with 4 additions and 2 deletions
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@ -25,7 +25,8 @@ def install():

 def emit_cephconf():
    cephcontext = {
-        'mon_hosts': ' '.join(get_mon_hosts())
+        'mon_hosts': ' '.join(get_mon_hosts().sort()),
+        'fsid': utils.config_get('fsid'),
        }

    with open('/etc/ceph/ceph.conf', 'w') as cephconf:
--- a/2
+++ b/2
@ -1 +1 @@
-33
+34
--- a/templates/ceph.conf
+++ b/templates/ceph.conf
@ -2,6 +2,7 @@
 auth supported = none
 keyring = /etc/ceph/$cluster.$name.keyring
 mon host = {{ mon_hosts }}
+ fsid = {{ fsid }}

 [mon]
 keyring = /var/lib/ceph/mon/$cluster-$id/keyring