Merge pull request #13 from autrejacoupa/patch-1

fix_device_mapping should return nil where fixed_device does not match /dev/xvd. This should fix creating ephemeral for m2.2xlarge.
rightscale-cookbooks · Feb 20, 2014 · de2d586 · de2d586
2 parents 23e7724 + 6b53595
commit de2d586
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/libraries/helper.rb b/libraries/helper.rb
@@ -95,6 +95,7 @@ def self.fix_device_mapping(devices, node_block_devices)
             fixed_device
           else
             Chef::Log.warn "could not find ephemeral device: #{device}"
+            nil
           end
         end
       end

diff --git a/spec/ephemeral_lvm_helper_spec.rb b/spec/ephemeral_lvm_helper_spec.rb
@@ -23,7 +23,8 @@
 
     it "skips the devices that cannot be mapped" do
       stub_const("Chef::Log", Logger.new('/dev/null'))
-      Chef::Log.should_receive(:warn).with("could not find ephemeral device: /dev/sdb")
+      Chef::Log.should_receive(:warn).with("could not find ephemeral device: /dev/sdb").and_return([])
+
       expect(
         EphemeralLvm::Helper.fix_device_mapping(["/dev/sda", "/dev/sdb"], ["xvda"])
       ).to eq(["/dev/xvda"])