Merge pull request #11 from orgsync-cookbooks/fix-ephemeral-helper

Make EphemeralLvm::Helper support all EC2 instance types

libraries/helper.rb

@@ -87,11 +87,11 @@ def self.get_ephemeral_devices(cloud, node)
     #
     def self.fix_device_mapping(devices, node_block_devices)
       devices.map! do |device|
-        if node_block_devices.include?(device.match(/\/dev\/([a-z]+)$/)[1])
+        if node_block_devices.include?(device.match(/\/dev\/(.+)$/)[1])
           device
         else
           fixed_device = device.sub("/sd", "/xvd")
-          if node_block_devices.include?(fixed_device.match(/\/dev\/([a-z]+)$/)[1])
+          if node_block_devices.include?(fixed_device.match(/\/dev\/(.+)$/)[1])
             fixed_device
           else
             Chef::Log.warn "could not find ephemeral device: #{device}"

spec/ephemeral_lvm_helper_spec.rb

@@ -28,5 +28,11 @@
         EphemeralLvm::Helper.fix_device_mapping(["/dev/sda", "/dev/sdb"], ["xvda"])
       ).to eq(["/dev/xvda"])
     end
+
+    it 'map devices with a numeric suffix' do
+      expect(
+        EphemeralLvm::Helper.fix_device_mapping(['/dev/sda2'], ['xvda2'])
+      ).to eq(['/dev/xvda2'])
+    end
   end
 end