From: Andy McCrae <andy.mccrae@googlemail.com>
Date: Thu, 26 Sep 2013 14:37:03 +0000 (+0100)
Subject: Fix status adjustment for "deployed" devices.
X-Git-Tag: v0.2.0~13^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F68%2Fhead;p=ceph-cookbooks.git

Fix status adjustment for "deployed" devices.
Because of how chef resource cloning works, when multiple devices are
setup, only the last device is actually set to "deployed" meaning
subsequent chef-client runs fail. This fix will ensure the resource isn't
cloned so each device is marked as "deployed" appropriately.
---

diff --git a/recipes/osd.rb b/recipes/osd.rb
index e3b56b4..6bd8412 100644
--- a/recipes/osd.rb
+++ b/recipes/osd.rb
@@ -133,13 +133,13 @@ else
         execute "Creating Ceph OSD on #{osd_device['device']}" do
           command create_cmd
           action :run
-          notifies :create, "ruby_block[save osd_device status]"
+          notifies :create, "ruby_block[save osd_device status #{index}]"
         end
         # we add this status to the node env
         # so that we can implement recreate
         # and/or delete functionalities in the
         # future.
-        ruby_block "save osd_device status" do
+        ruby_block "save osd_device status #{index}" do
           block do
             node.normal["ceph"]["osd_devices"][index]["status"] = "deployed"
             node.save