From bcad750c800371f3a512c36b345056f9c27d82ef Mon Sep 17 00:00:00 2001
From: Guilhem Lettron <guilhem@lettron.fr>
Date: Tue, 9 Apr 2013 14:27:50 +0200
Subject: [PATCH] Don't use libraries for things that must be in attributes

---
 attributes/mon.rb    | 6 ++++++
 attributes/osd.rb    | 6 ++++++
 libraries/default.rb | 9 ---------
 recipes/mon.rb       | 2 +-
 recipes/osd.rb       | 2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 attributes/mon.rb
 create mode 100644 attributes/osd.rb

diff --git a/attributes/mon.rb b/attributes/mon.rb
new file mode 100644
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
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 5ba1995..69ae4cd 100644
--- 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 0d15dc9..6522ecc 100644
--- 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 20bc04d..eb70b1c 100644
--- 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"