Don't use libraries for things that must be in attributes

diff --git a/attributes/mon.rb b/attributes/mon.rb
new file mode 100644 (file)
index 0000000..9120c78
--- /dev/null
+++ b/attributes/mon.rb
@@ -0,0 +1,6 @@
+case node['platform']
+when 'ubuntu'
+  default["ceph"]["mon"]["init_style"] = "upstart"
+else
+  default["ceph"]["mon"]["init_style"] = "sysvinit"
+end

diff --git a/attributes/osd.rb b/attributes/osd.rb
new file mode 100644 (file)
index 0000000..a005afc
--- /dev/null
+++ b/attributes/osd.rb
@@ -0,0 +1,6 @@
+case node['platform']
+when 'ubuntu'
+  default["ceph"]["osd"]["init_style"] = "upstart"
+else
+  default["ceph"]["osd"]["init_style"] = "sysvinit"
+end

diff --git a/libraries/default.rb b/libraries/default.rb
index 5ba19950fb7383e28ef233e0aa9df27f2e10e182..69ae4cd20a4cfd3ec53d362c10407f8d4b603eaf 100644 (file)
--- a/libraries/default.rb
+++ b/libraries/default.rb
@@ -118,12 +118,3 @@ def have_quorum?()
     state = JSON.parse(mon_status)['state']
     return QUORUM_STATES.include?(state)
 end
-
-def service_type()
-  case node['platform']
-  when 'ubuntu'
-    return "upstart"
-  else
-    return "sysvinit"
-  end
-end

diff --git a/recipes/mon.rb b/recipes/mon.rb
index 0d15dc9f5d899327c0905ab1a6575eccf7027e4e..6522ecc57f30b23a798b9820356c9a4efddd2f79 100644 (file)
--- a/recipes/mon.rb
+++ b/recipes/mon.rb
@@ -19,7 +19,7 @@ require 'json'
 include_recipe "ceph::default"
 include_recipe "ceph::conf"
 
-service_type = service_type()
+service_type = node["ceph"]["mon"]["init_style"]
 service "ceph_mon" do
   case service_type
   when "upstart"

diff --git a/recipes/osd.rb b/recipes/osd.rb
index 20bc04d85849c4cbc969b81765a39197cf05e0a5..eb70b1c4d08f7d1257e7d3c0743b5f358082311b 100644 (file)
--- a/recipes/osd.rb
+++ b/recipes/osd.rb
@@ -44,7 +44,7 @@ if !search(:node,"hostname:#{node['hostname']} AND dmcrypt:true").empty?
     end
 end
 
-service_type = service_type()
+service_type = node["ceph"]["osd"]["init_style"]
 service "ceph_osd" do
   case service_type
   when "sysvinit"