stackforge-attic/cookbook-ceph
Code Issues Proposed changes

Fix issue with old ceph-disk-prepare

Browse Source 
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 <alexandre.marangone@inktank.com>
This commit is contained in:
Alexandre Marangone 2013-03-29 10:39:26 -07:00
parent 904fb27f0d
commit 16e187d7c4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
recipes/osd.rb
View File

@ -130,6 +130,9 @@ else
# - $cluster should always be ceph # - $cluster should always be ceph
# - The --dmcrypt option will be available starting w/ Cuttlefish # - The --dmcrypt option will be available starting w/ Cuttlefish
node["ceph"]["osd_devices"].each_with_index do |osd_device,index| node["ceph"]["osd_devices"].each_with_index do |osd_device,index|
if not osd_device["status"].nil?
next
end
dmcrypt = "" dmcrypt = ""
if osd_device["encrypted"] == true if osd_device["encrypted"] == true
dmcrypt = "--dmcrypt" dmcrypt = "--dmcrypt"
@ -143,7 +146,7 @@ else
# so that we can implement recreate # so that we can implement recreate
# and/or delete functionalities in the # and/or delete functionalities in the
# future. # future.
node.normal["ceph"]["osd_devices"][index]["status"] == "deployed" node.normal["ceph"]["osd_devices"][index]["status"] = "deployed"
node.save node.save
end end
end end