From 75d8f0feefb5562be255471e6e5cda0b5b410d28 Mon Sep 17 00:00:00 2001
From: Paul Collins <paul.collins@canonical.com>
Date: Wed, 3 Oct 2012 21:19:14 +1300
Subject: [PATCH] write fsid to ceph.conf

---
 hooks/hooks.py      | 3 ++-
 revision            | 2 +-
 templates/ceph.conf | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hooks/hooks.py b/hooks/hooks.py
index 8ba49f3..3fe6fa0 100755
--- 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:
diff --git a/revision b/revision
index bb95160..a787364 100644
--- a/revision
+++ b/revision
@@ -1 +1 @@
-33
+34
diff --git a/templates/ceph.conf b/templates/ceph.conf
index ca5bc8f..32103fb 100644
--- 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