From: Walter  Huf <walter.huf@corvisa.com>
Date: Wed, 23 Jul 2014 14:09:20 +0000 (-0500)
Subject: Adds the fsid to ceph-osd hosts
X-Git-Tag: v0.8.0~24^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8ed213c2b21481c3976c50acc513fad1275944d;p=ceph-cookbooks.git

Adds the fsid to ceph-osd hosts
---

diff --git a/templates/default/ceph.conf.erb b/templates/default/ceph.conf.erb
index 6d6e4d2..1a1015c 100644
--- a/templates/default/ceph.conf.erb
+++ b/templates/default/ceph.conf.erb
@@ -1,7 +1,9 @@
 [global]
+<% unless node['ceph']['config']['fsid'].nil? -%>
+  fsid = <%= node['ceph']['config']['fsid'] %>
+<% end -%>
 <% if node['ceph']['is_mon'] -%>
-  fsid = <%= node["ceph"]["config"]["fsid"] %>
-  mon initial members = <%= node["ceph"]["config"]["mon_initial_members"] %>
+  mon initial members = <%= node['ceph']['config']['mon_initial_members'] %>
 <% end -%>
   mon host = <%= @mon_addresses.sort.join(', ') %>
 <% if (! node['ceph']['config']['global'].nil?) -%>