From: Greg Farnum <greg@inktank.com>
Date: Wed, 8 Aug 2012 16:10:58 +0000 (-0700)
Subject: remove check for swift on the node (crowbar)
X-Git-Tag: rebased~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e39f50ea97fbfc8964bf3326afafd80bf3f33393;p=ceph-cookbooks.git

remove check for swift on the node (crowbar)

Crowbar doesn't correctly handle running multiple disk
users on a node anyway, so just get rid of the check.
---

diff --git a/recipes/bootstrap_osd.rb b/recipes/bootstrap_osd.rb
index b5c6bc1..c578329 100644
--- a/recipes/bootstrap_osd.rb
+++ b/recipes/bootstrap_osd.rb
@@ -44,18 +44,8 @@ else
       block do
         do_trigger = false
         node["crowbar"]["disks"].each do |disk, data|
-          use = true
 
-          if node["swift"] and node["swift"]["devs"]
-            node["swift"]["devs"].each do |num|
-              if num["name"].match(disk)
-                puts "Disk: #{disk} is being used for swift, skipping"
-                use = false
-              end
-            end
-          end
-
-          if node["crowbar"]["disks"][disk]["usage"] == "Storage" and use == true
+          if node["crowbar"]["disks"][disk]["usage"] == "Storage"
             puts "Disk: #{disk} should be used for ceph"
 
             system 'ceph-disk-prepare', \