Merge pull request #885 from miq-bot/update_aws_instance_types

Update AWS instance_types

config/regions.yml

@@ -179,3 +179,11 @@ us-isob-east-1:
   :name: us-isob-east-1
   :hostname: ec2.us-isob-east-1.sc2s.sgov.gov
   :description: US ISOB East (Ohio)
+us-isof-east-1:
+  :name: us-isof-east-1
+  :hostname: ec2.us-isof-east-1.csp.hci.ic.gov
+  :description: US ISOF EAST
+us-isof-south-1:
+  :name: us-isof-south-1
+  :hostname: ec2.us-isof-south-1.csp.hci.ic.gov
+  :description: US ISOF SOUTH

db/fixtures/aws_database_types.yml

@@ -160,12 +160,12 @@ db.m5.24xlarge:
   :network_performance:
   :vcpu: 96
 db.m5.2xlarge:
-  :deprecated: false
-  :ebs_optimized: true
+  :deprecated: true
+  :ebs_optimized: false
   :family: General purpose
   :memory: 34359738368.0
   :name: db.m5.2xlarge
-  :network_performance: :very_high
+  :network_performance:
   :vcpu: 8
 db.m5.4xlarge:
   :deprecated: false
@@ -176,12 +176,12 @@ db.m5.4xlarge:
   :network_performance: :very_high
   :vcpu: 16
 db.m5.8xlarge:
-  :deprecated: false
+  :deprecated: true
   :ebs_optimized: false
   :family: General purpose
   :memory: 137438953472.0
   :name: db.m5.8xlarge
-  :network_performance: :very_high
+  :network_performance:
   :vcpu: 32
 db.m5.large:
   :deprecated: false
@@ -376,12 +376,12 @@ db.m6gd.xlarge:
   :network_performance: :very_high
   :vcpu: 4
 db.m6i.12xlarge:
-  :deprecated: false
+  :deprecated: true
   :ebs_optimized: false
   :family: General purpose
   :memory: 206158430208.0
   :name: db.m6i.12xlarge
-  :network_performance: :very_high
+  :network_performance:
   :vcpu: 48
 db.m6i.16xlarge:
   :deprecated: false
@@ -400,12 +400,12 @@ db.m6i.24xlarge:
   :network_performance:
   :vcpu: 96
 db.m6i.2xlarge:
-  :deprecated: true
+  :deprecated: false
   :ebs_optimized: false
   :family: General purpose
   :memory: 34359738368.0
   :name: db.m6i.2xlarge
-  :network_performance:
+  :network_performance: :very_high
   :vcpu: 8
 db.m6i.32xlarge:
   :deprecated: false
@@ -416,12 +416,12 @@ db.m6i.32xlarge:
   :network_performance: :very_high
   :vcpu: 128
 db.m6i.4xlarge:
-  :deprecated: true
+  :deprecated: false
   :ebs_optimized: false
   :family: General purpose
   :memory: 68719476736.0
   :name: db.m6i.4xlarge
-  :network_performance:
+  :network_performance: :very_high
   :vcpu: 16
 db.m6i.8xlarge:
   :deprecated: false
@@ -952,12 +952,12 @@ db.r4.xlarge:
   :network_performance: :very_high
   :vcpu: 4
 db.r5.12xlarge:
-  :deprecated: false
-  :ebs_optimized: true
+  :deprecated: true
+  :ebs_optimized: false
   :family: Memory optimized
   :memory: 412316860416.0
   :name: db.r5.12xlarge
-  :network_performance: :very_high
+  :network_performance:
   :vcpu: 48
 db.r5.12xlarge.tpc2.mem2x:
   :deprecated: false
@@ -1136,12 +1136,12 @@ db.r5b.24xlarge:
   :network_performance: :very_high
   :vcpu: 96
 db.r5b.2xlarge:
-  :deprecated: false
-  :ebs_optimized: true
+  :deprecated: true
+  :ebs_optimized: false
   :family: Memory optimized
   :memory: 68719476736.0
   :name: db.r5b.2xlarge
-  :network_performance: :very_high
+  :network_performance:
   :vcpu: 8
 db.r5b.2xlarge.tpc1.mem2x:
   :deprecated: false
@@ -1208,12 +1208,12 @@ db.r5b.6xlarge.tpc2.mem4x:
   :network_performance: :very_high
   :vcpu: 24
 db.r5b.8xlarge:
-  :deprecated: true
-  :ebs_optimized: false
+  :deprecated: false
+  :ebs_optimized: true
   :family: Memory optimized
   :memory: 274877906944.0
   :name: db.r5b.8xlarge
-  :network_performance:
+  :network_performance: :very_high
   :vcpu: 32
 db.r5b.8xlarge.tpc2.mem3x:
   :deprecated: false
@@ -1240,12 +1240,12 @@ db.r5b.large.tpc1.mem2x:
   :network_performance: :very_high
   :vcpu: 2
 db.r5b.xlarge:
-  :deprecated: true
-  :ebs_optimized: false
+  :deprecated: false
+  :ebs_optimized: true
   :family: Memory optimized
   :memory: 34359738368.0
   :name: db.r5b.xlarge
-  :network_performance:
+  :network_performance: :very_high
   :vcpu: 4
 db.r5b.xlarge.tpc2.mem2x:
   :deprecated: false
@@ -1440,12 +1440,12 @@ db.r6gd.xlarge:
   :network_performance: :very_high
   :vcpu: 4
 db.r6i.12xlarge:
-  :deprecated: false
+  :deprecated: true
   :ebs_optimized: false
   :family: Memory optimized
   :memory: 412316860416.0
   :name: db.r6i.12xlarge
-  :network_performance: :very_high
+  :network_performance:
   :vcpu: 48
 db.r6i.12xlarge.tpc2.mem2x:
   :deprecated: false
@@ -1504,12 +1504,12 @@ db.r6i.2xlarge.tpc2.mem8x:
   :network_performance: :very_high
   :vcpu: 8
 db.r6i.32xlarge:
-  :deprecated: true
+  :deprecated: false
   :ebs_optimized: false
   :family: Memory optimized
   :memory: 1099511627776.0
   :name: db.r6i.32xlarge
-  :network_performance:
+  :network_performance: :very_high
   :vcpu: 128
 db.r6i.4xlarge:
   :deprecated: false
@@ -1600,12 +1600,12 @@ db.r6i.large.tpc1.mem2x:
   :network_performance: :very_high
   :vcpu: 2
 db.r6i.xlarge:
-  :deprecated: true
+  :deprecated: false
   :ebs_optimized: false
   :family: Memory optimized
   :memory: 34359738368.0
   :name: db.r6i.xlarge
-  :network_performance:
+  :network_performance: :very_high
   :vcpu: 4
 db.r6i.xlarge.tpc2.mem2x:
   :deprecated: false
@@ -2104,12 +2104,12 @@ db.t3.2xlarge:
   :network_performance: :moderate
   :vcpu: 8
 db.t3.large:
-  :deprecated: true
+  :deprecated: false
   :ebs_optimized: false
   :family: General purpose
   :memory: 8589934592.0
   :name: db.t3.large
-  :network_performance:
+  :network_performance: :low_to_moderate
   :vcpu: 2
 db.t3.medium:
   :deprecated: false
@@ -2360,12 +2360,12 @@ db.x2iedn.2xlarge:
   :network_performance:
   :vcpu: 8
 db.x2iedn.32xlarge:
-  :deprecated: false
+  :deprecated: true
   :ebs_optimized: false
   :family: Memory optimized
   :memory: 4398046511104.0
   :name: db.x2iedn.32xlarge
-  :network_performance: :very_high
+  :network_performance:
   :vcpu: 128
 db.x2iedn.4xlarge:
   :deprecated: false
@@ -2392,20 +2392,20 @@ db.x2iedn.xlarge:
   :network_performance: :very_high
   :vcpu: 4
 db.x2iezn.12xlarge:
-  :deprecated: false
+  :deprecated: true
   :ebs_optimized: false
   :family: Memory optimized
   :memory: 1649267441664.0
   :name: db.x2iezn.12xlarge
-  :network_performance: :very_high
+  :network_performance:
   :vcpu: 48
 db.x2iezn.2xlarge:
-  :deprecated: true
+  :deprecated: false
   :ebs_optimized: false
   :family: Memory optimized
   :memory: 274877906944.0
   :name: db.x2iezn.2xlarge
-  :network_performance:
+  :network_performance: :very_high
   :vcpu: 8
 db.x2iezn.4xlarge:
   :deprecated: true
@@ -2424,12 +2424,12 @@ db.x2iezn.6xlarge:
   :network_performance:
   :vcpu: 24
 db.x2iezn.8xlarge:
-  :deprecated: false
+  :deprecated: true
   :ebs_optimized: false
   :family: Memory optimized
   :memory: 1099511627776.0
   :name: db.x2iezn.8xlarge
-  :network_performance: :very_high
+  :network_performance:
   :vcpu: 32
 db.z1d.12xlarge:
   :deprecated: false

db/fixtures/aws_instance_types.yml

@@ -6139,6 +6139,34 @@ f2.48xlarge:
   :vcpu: 192
   :virtualization_type: []
   :vpc_only: true
+f2.6xlarge:
+  :architecture:
+  - :x86_64
+  :cluster_networking:
+  :current_generation: true
+  :current_version: true
+  :description: F2 6xlarge
+  :ebs_only: false
+  :ebs_optimized_available: true
+  :enhanced_networking: true
+  :family: FPGA Instances
+  :instance_store_size: 1009317314560
+  :instance_store_size_gb: 940.0
+  :instance_store_type: NVMe SSD
+  :instance_store_volumes: 1
+  :intel_aes_ni: true
+  :intel_avx:
+  :intel_avx2:
+  :intel_turbo:
+  :memory: 274877906944
+  :memory_gb: 256.0
+  :name: f2.6xlarge
+  :network_performance: :very_high
+  :physical_processor: AMD EPYC 7R13 Processor
+  :processor_clock_speed: 2.95 GHz
+  :vcpu: 24
+  :virtualization_type: []
+  :vpc_only: true
 g2.2xlarge:
   :architecture:
   - :x86_64