Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add new Amazon D2 instance types and deprecate the HS1 instance type. #2514

Merged
merged 1 commit into from Apr 7, 2015
Merged

Add new Amazon D2 instance types and deprecate the HS1 instance type. #2514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
124 changes: 108 additions & 16 deletions lib/Amazon/MiqEc2InstanceTypes.rb
View file
Open in desktop
Expand Up @@ -574,7 +574,7 @@ module MiqEc2InstanceTypes
:memory => 61.gigabytes,
:vcpu => 8,
:ebs_only => false,
:instance_store_size => 1600.gigabytes,
:instance_store_size => 1_600.gigabytes,
:instance_store_volumes => 2, # SSD
:architecture => [:x86_64],
:virtualization_type => [:hvm],
Expand All @@ -597,7 +597,7 @@ module MiqEc2InstanceTypes
:memory => 122.gigabytes,
:vcpu => 16,
:ebs_only => false,
:instance_store_size => 3200.gigabytes,
:instance_store_size => 3_200.gigabytes,
:instance_store_volumes => 4, # SSD
:architecture => [:x86_64],
:virtualization_type => [:hvm],
Expand All @@ -620,7 +620,7 @@ module MiqEc2InstanceTypes
:memory => 244.gigabytes,
:vcpu => 32,
:ebs_only => false,
:instance_store_size => 6400.gigabytes,
:instance_store_size => 6_400.gigabytes,
:instance_store_volumes => 8, # SSD
:architecture => [:x86_64],
:virtualization_type => [:hvm],
Expand All @@ -636,26 +636,95 @@ module MiqEc2InstanceTypes
:cluster_networking => true,
},

"hs1.8xlarge" => {
:name => "hs1.8xlarge",
"d2.xlarge" => {
:name => "d2.xlarge",
:family => "Storage Optimized",
:description => "High Storage Eight Extra Large",
:memory => 117.gigabytes,
:description => "D2 Extra Large",
:memory => 30.5.gigabytes,
:vcpu => 4,
:ebs_only => false,
:instance_store_size => 6_000.gigabytes,
:instance_store_volumes => 3,
:architecture => [:x86_64],
:virtualization_type => [:hvm],
:network_performance => :moderate,
:physical_processor => "Intel Xeon E5-2676v3",
:processor_clock_speed => 2.4, # GHz
:intel_aes_ni => true,
:intel_avx => true,
:intel_avx2 => true,
:intel_turbo => true,
:ebs_optimized_available => true,
:enhanced_networking => true,
:cluster_networking => true,
},

"d2.2xlarge" => {
:name => "d2.2xlarge",
:family => "Storage Optimized",
:description => "D2 Double Extra Large",
:memory => 61.gigabytes,
:vcpu => 8,
:ebs_only => false,
:instance_store_size => 12_000.gigabytes,
:instance_store_volumes => 6,
:architecture => [:x86_64],
:virtualization_type => [:hvm],
:network_performance => :high,
:physical_processor => "Intel Xeon E5-2676v3",
:processor_clock_speed => 2.4, # GHz
:intel_aes_ni => true,
:intel_avx => true,
:intel_avx2 => true,
:intel_turbo => true,
:ebs_optimized_available => true,
:enhanced_networking => true,
:cluster_networking => true,
},

"d2.4xlarge" => {
:name => "d2.4xlarge",
:family => "Storage Optimized",
:description => "D2 Quadruple Extra Large",
:memory => 122.gigabytes,
:vcpu => 16,
:ebs_only => false,
:instance_store_size => 48.terabytes,
:instance_store_size => 24_000.gigabytes,
:instance_store_volumes => 12,
:architecture => [:x86_64],
:virtualization_type => [:hvm],
:network_performance => :high,
:physical_processor => "Intel Xeon E5-2676v3",
:processor_clock_speed => 2.4, # GHz
:intel_aes_ni => true,
:intel_avx => true,
:intel_avx2 => true,
:intel_turbo => true,
:ebs_optimized_available => true,
:enhanced_networking => true,
:cluster_networking => true,
},

"d2.8xlarge" => {
:name => "d2.8xlarge",
:family => "Storage Optimized",
:description => "D2 Eight Extra Large",
:memory => 244.gigabytes,
:vcpu => 36,
:ebs_only => false,
:instance_store_size => 48_000.gigabytes,
:instance_store_volumes => 24,
:architecture => [:x86_64],
:virtualization_type => [:paravirtual, :hvm],
:virtualization_type => [:hvm],
:network_performance => :very_high,
:physical_processor => "Intel Xeon E5-2650",
:processor_clock_speed => 2.0, # GHz
:physical_processor => "Intel Xeon E5-2676v3",
:processor_clock_speed => 2.4, # GHz
:intel_aes_ni => true,
:intel_avx => nil,
:intel_avx2 => nil,
:intel_turbo => nil,
:ebs_optimized_available => nil,
:enhanced_networking => nil,
:intel_avx => true,
:intel_avx2 => true,
:intel_turbo => true,
:ebs_optimized_available => true,
:enhanced_networking => true,
:cluster_networking => true,
},
}
Expand Down Expand Up @@ -983,6 +1052,29 @@ module MiqEc2InstanceTypes
:enhanced_networking => nil,
:cluster_networking => nil,
},

"hs1.8xlarge" => {
:name => "hs1.8xlarge",
:family => "Storage Optimized",
:description => "High Storage Eight Extra Large",
:memory => 117.gigabytes,
:vcpu => 16,
:ebs_only => false,
:instance_store_size => 48.terabytes,
:instance_store_volumes => 24,
:architecture => [:x86_64],
:virtualization_type => [:paravirtual, :hvm],
:network_performance => :very_high,
:physical_processor => "Intel Xeon E5-2650",
:processor_clock_speed => 2.0, # GHz
:intel_aes_ni => true,
:intel_avx => nil,
:intel_avx2 => nil,
:intel_turbo => nil,
:ebs_optimized_available => nil,
:enhanced_networking => nil,
:cluster_networking => true,
},
}

# Types that are no longer advertised
Expand Down
4 changes: 2 additions & 2 deletions vmdb/spec/models/ems_refresh/refreshers/ec2_refresher_other_region_spec.rb
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@

def assert_table_counts
ExtManagementSystem.count.should == 1
Flavor.count.should == 43
Flavor.count.should == 47
AvailabilityZone.count.should == 3
FloatingIp.count.should == 1
AuthPrivateKey.count.should == 2
Expand Down Expand Up @@ -61,7 +61,7 @@ def assert_ems
:uid_ems => nil
)

@ems.flavors.size.should == 43
@ems.flavors.size.should == 47
@ems.availability_zones.size.should == 3
@ems.floating_ips.size.should == 1
@ems.key_pairs.size.should == 2
Expand Down
4 changes: 2 additions & 2 deletions vmdb/spec/models/ems_refresh/refreshers/ec2_refresher_spec.rb
View file
Open in desktop
Expand Up @@ -40,7 +40,7 @@

def assert_table_counts
ExtManagementSystem.count.should == 1
Flavor.count.should == 43
Flavor.count.should == 47
AvailabilityZone.count.should == 5
FloatingIp.count.should == 5
AuthPrivateKey.count.should == 7
Expand Down Expand Up @@ -76,7 +76,7 @@ def assert_ems
:uid_ems => nil
)

@ems.flavors.size.should == 43
@ems.flavors.size.should == 47
@ems.availability_zones.size.should == 5
@ems.floating_ips.size.should == 5
@ems.key_pairs.size.should == 7
Expand Down