From: Guilhem Lettron <guilhem.lettron@optiflows.com>
Date: Wed, 19 Feb 2014 15:27:31 +0000 (+0100)
Subject: Small refactoring for ceph-disk-{prepare|activate}
X-Git-Tag: v0.2.0~7^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3b2e00a972e8f952ea9eb92fcaaadddc3817540e;p=ceph-cookbooks.git

Small refactoring for ceph-disk-{prepare|activate}
---

diff --git a/recipes/osd.rb b/recipes/osd.rb
index 00f6fe5..fd5d216 100644
--- a/recipes/osd.rb
+++ b/recipes/osd.rb
@@ -110,22 +110,25 @@ else
         next
       end
 
-      dmcrypt = osd_device["encrypted"] == true ? "--dmcrypt" : ""
-
-      create_cmd = "ceph-disk-prepare #{dmcrypt} #{osd_device['device']} #{osd_device['journal']}"
-      if osd_device["type"] == "directory"
-        directory osd_device["device"] do
-          owner "root"
-          group "root"
-          recursive true
-        end
-        create_cmd << " && ceph-disk-activate #{osd_device['device']}"
+      directory osd_device["device"] do # ~FC022
+        owner "root"
+        group "root"
+        recursive true
+        only_if { osd_device["type"] == "directory" }
       end
-      execute "Creating Ceph OSD on #{osd_device['device']}" do
-        command create_cmd
+
+      dmcrypt = osd_device["encrypted"] == true ? '--dmcrypt' : ''
+
+      execute "ceph-disk-prepare on #{osd_device['device']}" do
+        command "ceph-disk-prepare #{dmcrypt} #{osd_device['device']} #{osd_device['journal']}"
         action :run
-        notifies :create, "ruby_block[save osd_device status #{index}]"
+        notifies :create, "ruby_block[save osd_device status #{index}]", :immediately
       end
+
+      execute "ceph-disk-activate #{osd_device['device']}" do
+        only_if { osd_device["type"] == "directory" }
+      end
+
       # we add this status to the node env
       # so that we can implement recreate
       # and/or delete functionalities in the