]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-cookbooks.git/commitdiff
remove check for swift on the node (crowbar)
authorGreg Farnum <greg@inktank.com>
Wed, 8 Aug 2012 16:10:58 +0000 (09:10 -0700)
committerGreg Farnum <greg@inktank.com>
Tue, 4 Sep 2012 21:59:35 +0000 (14:59 -0700)
Crowbar doesn't correctly handle running multiple disk
users on a node anyway, so just get rid of the check.

recipes/bootstrap_osd.rb

index b5c6bc1037274a8fbd48cd6161c706c8f0a9652d..c578329b597d9c977cf1cccf22df2e233a421ec5 100644 (file)
@@ -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', \