Crowbar: Don't try to play nice with Swift.

We tried to avoid using data disks that swift-storage has taken over,
but nothing guarded us against Swift stepping on our toes. Similarly,
we never protected nova-multi-volume's toes. Current Crowbar just
doesn't solve this problem; don't try.

Do NOT install ceph-osd on the same machine as swift-storage or
nova-multi-volume.

diff --git a/recipes/osd.rb b/recipes/osd.rb
index 636dddc7448f0a1e682e0f78ba73ca0502d09c12..90d2ccae4e1f176f209107a7b5ea61f5e170a2fd 100644 (file)
--- a/recipes/osd.rb
+++ b/recipes/osd.rb
@@ -65,15 +65,6 @@ else
         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
             puts "Disk: #{disk} should be used for ceph"