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 #2563 from FestivalBobcats/master

Browse source 
Support for new HVM-based instance types on Amazon EC2
This commit is contained in:
Wesley Beary 2014-01-10 13:49:16 -08:00
commit 09ade37f69
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/fog/aws/models/compute/flavors.rb
View file

@ -26,9 +26,10 @@ module Fog
{ :bits => 64, :cores => 35, :disk => 50331648, :id => 'hs1.8xlarge', :name => 'High Storage Eight Extra Large', :ram => 119808},
{ :bits => 64, :cores => 6.5, :disk => 420, :id => 'm2.xlarge', :name => 'High-Memory Extra Large', :ram => 17510.4},
{ :bits => 64, :cores => 13, :disk => 850, :id => 'm2.2xlarge', :name => 'High Memory Double Extra Large', :ram => 35020.8},
{ :bits => 64, :cores => 26, :disk => 1690, :id => 'm2.4xlarge', :name => 'High Memory Quadruple Extra Large', :ram => 70041.6},
{ :bits => 64, :cores => 6.5, :disk => 420, :id => 'm2.xlarge', :name => 'High-Memory Extra Large', :ram => 17510.4},
{ :bits => 64, :cores => 13, :disk => 850, :id => 'm2.2xlarge', :name => 'High Memory Double Extra Large', :ram => 35020.8},
{ :bits => 64, :cores => 26, :disk => 1690, :id => 'm2.4xlarge', :name => 'High Memory Quadruple Extra Large', :ram => 70041.6},
{ :bits => 64, :cores => 88, :disk => 240, :id => 'cr1.8xlarge', :name => 'High Memory Eight Extra Large', :ram => 249856},
{ :bits => 64, :cores => 13, :disk => 0, :id => 'm3.xlarge', :name => 'M3 Extra Large', :ram => 15360},
{ :bits => 64, :cores => 26, :disk => 0, :id => 'm3.2xlarge', :name => 'M3 Double Extra Large', :ram => 30720},
@ -37,7 +38,12 @@ module Fog
{ :bits => 64, :cores => 33.5, :disk => 1690, :id => 'cc1.4xlarge', :name => 'Cluster Compute Quadruple Extra Large', :ram => 23552},
{ :bits => 64, :cores => 88, :disk => 3370, :id => 'cc2.8xlarge', :name => 'Cluster Compute Eight Extra Large', :ram => 61952},
{ :bits => 64, :cores => 33.5, :disk => 1690, :id => 'cg1.4xlarge', :name => 'Cluster GPU Quadruple Extra Large', :ram => 22528}
{ :bits => 64, :cores => 33.5, :disk => 1690, :id => 'cg1.4xlarge', :name => 'Cluster GPU Quadruple Extra Large', :ram => 22528},
{ :bits => 64, :cores => 14, :disk => 800, :id => 'i2.xlarge', :name => 'I2 Extra Large', :ram => 31232},
{ :bits => 64, :cores => 27, :disk => 1600, :id => 'i2.2xlarge', :name => 'I2 Double Extra Large', :ram => 62464},
{ :bits => 64, :cores => 53, :disk => 3200, :id => 'i2.4xlarge', :name => 'I2 Quadruple Extra Large', :ram => 124928},
{ :bits => 64, :cores => 104, :disk => 6400, :id => 'i2.8xlarge', :name => 'I2 Eight Extra Large', :ram => 249856}
]
class Flavors < Fog::Collection

2
lib/fog/aws/requests/compute/run_instances.rb
View file

@ -36,7 +36,7 @@ module Fog
# * 'SecurityGroupId'<~Array> or <~String> - id's of security group(s) for instances, use this or SecurityGroup
# * 'InstanceInitiatedShutdownBehaviour'<~String> - specifies whether volumes are stopped or terminated when instance is shutdown, in [stop, terminate]
# * 'InstanceType'<~String> - Type of instance to boot. Valid options
# in ['t1.micro', 'm1.small', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'm2.xlarge', m2.2xlarge', 'm2.4xlarge', 'cc1.4xlarge', 'cc2.8xlarge', 'cg1.4xlarge']
# in ['t1.micro', 'm1.small', 'm1.medium', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'c3.large', 'c3.xlarge', 'c3.2xlarge', 'c3.4xlarge', 'c3.8xlarge', 'g2.2xlarge', 'hs1.8xlarge', 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', 'cr1.8xlarge', 'm3.xlarge', 'm3.2xlarge', 'hi1.4xlarge', 'cc1.4xlarge', 'cc2.8xlarge', 'cg1.4xlarge', 'i2.xlarge', 'i2.2xlarge', 'i2.4xlarge', 'i2.8xlarge']
# default is 'm1.small'
# * 'KernelId'<~String> - Id of kernel with which to launch
# * 'KeyName'<~String> - Name of a keypair to add to booting instances