Adds the fsid to ceph-osd hosts

diff --git a/templates/default/ceph.conf.erb b/templates/default/ceph.conf.erb
index 6d6e4d2bb8dc5494dac44f9f9ea48ce84cb44b84..1a1015cbed7ffa2ee7c524ba60e1466178dcb995 100644 (file)
--- 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?) -%>