check fsid and mon_initial_members in mon role, not conf

Neither clients nor OSDs actually need these to be filled in,
and requiring it here makes adding clients by doing an
"include_recipe ceph::bootstrap_client" hard.

diff --git a/recipes/conf.rb b/recipes/conf.rb
index 582ab5bf07e40373597311c9d510bfc2bf5cf9c3..76df81f7401092f54fb845db944fab0208d89cf4 100644 (file)
--- a/recipes/conf.rb
+++ b/recipes/conf.rb
@@ -1,6 +1,3 @@
-raise "fsid must be set in config" if node["ceph"]["config"]['fsid'].nil?
-raise "mon_initial_members must be set in config" if node["ceph"]["config"]['mon_initial_members'].nil?
-
 mon_addresses = get_mon_addresses()
 
 template '/etc/ceph/ceph.conf' do

diff --git a/recipes/mon.rb b/recipes/mon.rb
index 8c8bb260b0f8968ad80923741b4d25eaf8571e4f..0b2d94f300b71d9ae4ae9d975ca8c3fbbc9b9d30 100644 (file)
--- a/recipes/mon.rb
+++ b/recipes/mon.rb
@@ -1,4 +1,7 @@
 # this recipe creates a monitor cluster
+raise "fsid must be set in config" if node["ceph"]["config"]['fsid'].nil?
+raise "mon_initial_members must be set in config" if node["ceph"]["config"]['mon_initial_members'].nil?
+
 
 require 'json'