Merge pull request crowbar#1300 from dirkmueller/bootdev_detection

Bootdisk detection: Skip cciss, prefer wwn's
scottwulf · Aug 18, 2017 · 6394f2f · 6394f2f
2 parents 7dc718b + 71d1fa9
commit 6394f2f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/chef/cookbooks/barclamp/libraries/barclamp_library.rb b/chef/cookbooks/barclamp/libraries/barclamp_library.rb
@@ -340,7 +340,6 @@ def unique_name
                 candidates.find { |b| b =~ /^scsi-[^1]/ } ||
                 candidates.find { |b| b =~ /^scsi-/ } ||
                 candidates.find { |b| b =~ /^ata-/ } ||
-                candidates.find { |b| b =~ /^cciss-/ } ||
                 candidates.first
 
               unless match.empty?

diff --git a/chef/cookbooks/provisioner/recipes/bootdisk.rb b/chef/cookbooks/provisioner/recipes/bootdisk.rb
@@ -88,11 +88,11 @@
         # reusable than the normal links.
         # Note: this find construct should match the code in
         # barclamp/libraries/barclamp_library.rb (from deployer)
-        bootdisk = bootdisks.find{ |b|b =~ /^scsi-[a-zA-Z]/ } ||
-          bootdisks.find{ |b|b =~ /^scsi-[^1]/ } ||
-          bootdisks.find{ |b|b =~ /^scsi-/ } ||
-          bootdisks.find{ |b|b =~ /^ata-/ } ||
-          bootdisks.find{ |b|b =~ /^cciss-/ } ||
+        bootdisk = bootdisks.find { |b| b =~ /^wwn-/ } ||
+          bootdisks.find { |b| b =~ /^scsi-[a-zA-Z]/ } ||
+          bootdisks.find { |b| b =~ /^scsi-[^1]/ } ||
+          bootdisks.find { |b| b =~ /^scsi-/ } ||
+          bootdisks.find { |b| b =~ /^ata-/ } ||
           bootdisks.first
         dev = "disk/by-id/#{bootdisk}"
       end