From: Tommi Virtanen <tv@inktank.com>
Date: Mon, 6 Aug 2012 20:24:11 +0000 (-0700)
Subject: Crowbar: Don't try to play nice with Swift.
X-Git-Tag: rebased^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dd84b6ff9cb09d09eaed008c9909a2ccb9630b0c;p=ceph-cookbooks.git

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 636dddc..90d2cca 100644
--- 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"