From f8ed213c2b21481c3976c50acc513fad1275944d Mon Sep 17 00:00:00 2001 From: Walter Huf Date: Wed, 23 Jul 2014 09:09:20 -0500 Subject: [PATCH] Adds the fsid to ceph-osd hosts --- templates/default/ceph.conf.erb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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?) -%> -- 2.47.3