kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

Merge pull request #3060 from engineyard/support_xvd_based_instances

Browse source 
[aws] support `xvd` based devices (HVM)
This commit is contained in:
Wesley Beary 2014-07-16 14:50:43 -05:00
commit db0e7c98f6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/fog/aws/requests/compute/register_image.rb
View file

@ -43,7 +43,7 @@ module Fog
} }
# This determines if we are doing a snapshot or a S3 backed AMI. # This determines if we are doing a snapshot or a S3 backed AMI.
if(location =~ /^\/dev\/sd[a-p]\d{0,2}$/) if(location =~ /^\/dev\/(xvd|sd)[a-p]\d{0,2}$/)
common_options['RootDeviceName'] = location common_options['RootDeviceName'] = location
else else
common_options['ImageLocation'] = location common_options['ImageLocation'] = location
@ -90,7 +90,7 @@ module Fog
'registered' => Time.now 'registered' => Time.now
} }
if location[/^\/dev\/sd[a-p]\d{0,2}$/] if location[/^\/dev\/(xvd|sd)[a-p]\d{0,2}$/]
image['rootDeviceName'] = location image['rootDeviceName'] = location
image['rootDeviceType'] = 'ebs' image['rootDeviceType'] = 'ebs'
else else