From 16e187d7c4583f0ada785273515879dc89c0463a Mon Sep 17 00:00:00 2001 From: Alexandre Marangone Date: Fri, 29 Mar 2013 10:39:26 -0700 Subject: [PATCH] Fix issue with old ceph-disk-prepare Old ceph-disk-prepare re-write the partition table and fail before writting the Parition GUID. This fix tests the presence of a osd_device status, if present, we skip the OSD. It also fix a typo when setting the osd_device status Signed-off-by: Alexandre Marangone --- recipes/osd.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/osd.rb b/recipes/osd.rb index ce26224..5380868 100644 --- a/recipes/osd.rb +++ b/recipes/osd.rb @@ -130,6 +130,9 @@ else # - $cluster should always be ceph # - The --dmcrypt option will be available starting w/ Cuttlefish node["ceph"]["osd_devices"].each_with_index do |osd_device,index| + if not osd_device["status"].nil? + next + end dmcrypt = "" if osd_device["encrypted"] == true dmcrypt = "--dmcrypt" @@ -143,7 +146,7 @@ else # so that we can implement recreate # and/or delete functionalities in the # future. - node.normal["ceph"]["osd_devices"][index]["status"] == "deployed" + node.normal["ceph"]["osd_devices"][index]["status"] = "deployed" node.save end end