fog-aws 3.0.0 → 3.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +24 -2
  3. data/lib/fog/aws.rb +14 -1
  4. data/lib/fog/aws/auto_scaling.rb +1 -0
  5. data/lib/fog/aws/compute.rb +16 -18
  6. data/lib/fog/aws/models/auto_scaling/group.rb +10 -0
  7. data/lib/fog/aws/models/compute/flavors.rb +106 -106
  8. data/lib/fog/aws/models/compute/servers.rb +7 -4
  9. data/lib/fog/aws/models/efs/file_system.rb +4 -0
  10. data/lib/fog/aws/models/rds/server.rb +62 -60
  11. data/lib/fog/aws/parsers/rds/db_parser.rb +2 -1
  12. data/lib/fog/aws/requests/auto_scaling/set_instance_protection.rb +67 -0
  13. data/lib/fog/aws/requests/dns/change_resource_record_sets.rb +4 -4
  14. data/lib/fog/aws/requests/efs/create_file_system.rb +15 -3
  15. data/lib/fog/aws/storage.rb +4 -3
  16. data/lib/fog/aws/version.rb +1 -1
  17. data/stale.yml +17 -0
  18. data/tests/requests/auto_scaling/auto_scaling_tests.rb +8 -0
  19. data/tests/requests/efs/helper.rb +2 -0
  20. metadata +4 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8397c56917f7c1ee4e17de5f7ab0bd60878a95bb781f4c4bbada930ace0fea85
4
- data.tar.gz: 6258fccc1a3bba86c6fe25c08a4cb59b3ce018d9d9b03ad1fccf2d9fa8f68e3f
3
+ metadata.gz: aac9652511aa143bb323c95c4d689ad4ad7ef814897c0ebf9c092a988f389f6c
4
+ data.tar.gz: dd000a246a353f3e5ff3af9e89f176cdf185f357d46942801cd05a4458749fec
5
5
  SHA512:
6
- metadata.gz: 5febe6270c40489d8c4c3eb2c0ae5cf25f026ebb86a33f91bfebcf15202bc558b542af6c6c4ea9ca2374be5e38d2ea46d5edfb19b143d3bfc7d8f760ae6c69c9
7
- data.tar.gz: ae79ca65ce7c0d23ea19aafba363f9e5867a32062ef7b9f61d908454e9e35c1f502d08ad8bb5abc596a4a41fbfa961b376fd0e6131245086be21164f7f434ff9
6
+ metadata.gz: 9a825c214d63da9e09cb774f65367b06506d01ae6d6785ee55c43b2df7542a5ed9853f937a7fde42615cdd2ab3439a179eb67803efde76ef22881cc008052d05
7
+ data.tar.gz: 2efa8f2b5809cd0f817360e715ad1b0eec87ba13380ddbbebfc98376159293fda6bc5ec7113094a7263903e15d6e65640d85ea85b09f1ce0d723a7f41f7a0f08
data/CHANGELOG.md CHANGED
@@ -2,7 +2,29 @@
2
2
 
3
3
  ## [Unreleased](https://github.com/fog/fog-aws/tree/HEAD)
4
4
 
5
- [Full Changelog](https://github.com/fog/fog-aws/compare/v2.0.1...HEAD)
5
+ [Full Changelog](https://github.com/fog/fog-aws/compare/v3.0.0...HEAD)
6
+
7
+ **Closed issues:**
8
+
9
+ - add region cn-northwest-1 [\#455](https://github.com/fog/fog-aws/issues/455)
10
+ - Parameterize "RequestLimitExceeded" jitter magnitude [\#448](https://github.com/fog/fog-aws/issues/448)
11
+ - Release new version to RubyGems [\#442](https://github.com/fog/fog-aws/issues/442)
12
+
13
+ **Merged pull requests:**
14
+
15
+ - Fix & update aws flavor \(provided in GiB\) to Megabytes \(floor rounded\). [\#454](https://github.com/fog/fog-aws/pull/454) ([xward](https://github.com/xward))
16
+ - Update aws flavors cpu count for gpu oriented flavor. [\#453](https://github.com/fog/fog-aws/pull/453) ([xward](https://github.com/xward))
17
+ - Update aws flavors cpu count. [\#452](https://github.com/fog/fog-aws/pull/452) ([xward](https://github.com/xward))
18
+ - Parameterized retry [\#451](https://github.com/fog/fog-aws/pull/451) ([lvangool](https://github.com/lvangool))
19
+ - Fix c1.xlarge cpu count [\#449](https://github.com/fog/fog-aws/pull/449) ([romaintb](https://github.com/romaintb))
20
+ - Retry if instance not found when adding EC2 tags [\#446](https://github.com/fog/fog-aws/pull/446) ([tracemeyers](https://github.com/tracemeyers))
21
+ - Support new Paris and AP Osaka load balancers in DNS [\#445](https://github.com/fog/fog-aws/pull/445) ([mattheworiordan](https://github.com/mattheworiordan))
22
+ - Docs: Update changelog for 3.0.0 [\#444](https://github.com/fog/fog-aws/pull/444) ([jaredbeck](https://github.com/jaredbeck))
23
+ - Add encryption to EFS FileSystem creation [\#438](https://github.com/fog/fog-aws/pull/438) ([acant](https://github.com/acant))
24
+ - SetInstanceProtection endpoint for auto scaling groups support [\#436](https://github.com/fog/fog-aws/pull/436) ([thorn](https://github.com/thorn))
25
+
26
+ ## [v3.0.0](https://github.com/fog/fog-aws/tree/v3.0.0) (2018-04-23)
27
+ [Full Changelog](https://github.com/fog/fog-aws/compare/v2.0.1...v3.0.0)
6
28
 
7
29
  **Closed issues:**
8
30
 
@@ -652,7 +674,7 @@
652
674
  - \[AWS|Autoscaling\] Support classic link related properties for launch configurations [\#32](https://github.com/fog/fog-aws/pull/32) ([fcheung](https://github.com/fcheung))
653
675
  - fix autoscaling activities collection setup [\#31](https://github.com/fog/fog-aws/pull/31) ([fcheung](https://github.com/fcheung))
654
676
  - Add PlacementTenancy to launch configuration parser and test case [\#29](https://github.com/fog/fog-aws/pull/29) ([benpillet](https://github.com/benpillet))
655
- - Use Fog::Formatador [\#27](https://github.com/fog/fog-aws/pull/27) ([starbelly](https://github.com/starbelly))
677
+ - Use Fog::Formatador [\#27](https://github.com/fog/fog-aws/pull/27) ([ghost](https://github.com/ghost))
656
678
 
657
679
  ## [v0.0.7](https://github.com/fog/fog-aws/tree/v0.0.7) (2015-01-23)
658
680
  [Full Changelog](https://github.com/fog/fog-aws/compare/v0.0.6...v0.0.7)
data/lib/fog/aws.rb CHANGED
@@ -229,7 +229,20 @@ module Fog
229
229
  end
230
230
 
231
231
  def self.regions
232
- @regions ||= ['ap-northeast-1', 'ap-northeast-2', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'ca-central-1', 'eu-west-1', 'eu-west-2', 'eu-west-3', 'us-east-1', 'us-east-2', 'us-west-1', 'us-west-2', 'sa-east-1', 'cn-north-1', 'us-gov-west-1', 'ap-south-1']
232
+ @regions ||= [
233
+ 'ap-northeast-1', 'ap-northeast-2', 'ap-northeast-3',
234
+ 'ap-south-1',
235
+ 'ap-southeast-1', 'ap-southeast-2',
236
+ 'ca-central-1',
237
+ 'cn-north-1',
238
+ 'cn-northwest-1',
239
+ 'eu-central-1',
240
+ 'eu-west-1', 'eu-west-2', 'eu-west-3',
241
+ 'us-east-1', 'us-east-2',
242
+ 'us-west-1', 'us-west-2',
243
+ 'sa-east-1',
244
+ 'us-gov-west-1'
245
+ ]
233
246
  end
234
247
 
235
248
  def self.validate_region!(region, host=nil)
data/lib/fog/aws/auto_scaling.rb CHANGED
@@ -48,6 +48,7 @@ module Fog
48
48
  request :resume_processes
49
49
  request :set_desired_capacity
50
50
  request :set_instance_health
51
+ request :set_instance_protection
51
52
  request :suspend_processes
52
53
  request :terminate_instance_in_auto_scaling_group
53
54
  request :update_auto_scaling_group
data/lib/fog/aws/compute.rb CHANGED
@@ -6,7 +6,7 @@ module Fog
6
6
  class RequestLimitExceeded < Fog::Errors::Error; end
7
7
 
8
8
  requires :aws_access_key_id, :aws_secret_access_key
9
- recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent, :aws_session_token, :use_iam_profile, :aws_credentials_expire_at, :instrumentor, :instrumentor_name, :version
9
+ recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent, :aws_session_token, :use_iam_profile, :aws_credentials_expire_at, :instrumentor, :instrumentor_name, :version, :retry_request_limit_exceeded, :retry_jitter_magnitude
10
10
 
11
11
  secrets :aws_secret_access_key, :hmac, :aws_session_token
12
12
 
@@ -546,11 +546,13 @@ module Fog
546
546
 
547
547
  def initialize(options={})
548
548
 
549
- @connection_options = options[:connection_options] || {}
550
- @region = options[:region] ||= 'us-east-1'
551
- @instrumentor = options[:instrumentor]
552
- @instrumentor_name = options[:instrumentor_name] || 'fog.aws.compute'
553
- @version = options[:version] || '2016-11-15'
549
+ @connection_options = options[:connection_options] || {}
550
+ @region = options[:region] ||= 'us-east-1'
551
+ @instrumentor = options[:instrumentor]
552
+ @instrumentor_name = options[:instrumentor_name] || 'fog.aws.compute'
553
+ @version = options[:version] || '2016-11-15'
554
+ @retry_request_limit_exceeded = options.fetch(:retry_request_limit_exceeded, true)
555
+ @retry_jitter_magnitude = options[:retry_jitter_magnitude] || 0.1
554
556
 
555
557
  @use_iam_profile = options[:use_iam_profile]
556
558
  setup_credentials(options)
@@ -633,22 +635,18 @@ module Fog
633
635
  raise case match[:code]
634
636
  when 'NotFound', 'Unknown'
635
637
  Fog::Compute::AWS::NotFound.slurp(error, match[:message])
636
- when 'RequestLimitExceeded'
637
- if retries < max_retries
638
- jitter = rand(100)
639
- waiting = true
640
- start_time = Time.now
641
- wait_time = ((2.0 ** (1.0 + retries) * 100) + jitter) / 1000.0
638
+ when 'RequestLimitExceeded'
639
+ if @retry_request_limit_exceeded && retries < max_retries
640
+ jitter = rand * 10 * @retry_jitter_magnitude
641
+ wait_time = ((2.0 ** (1.0 + retries) * 100) / 1000.0) + jitter
642
642
  Fog::Logger.warning "Waiting #{wait_time} seconds to retry."
643
- while waiting
644
- if Time.now - start_time >= wait_time
645
- waiting = false
646
- end
647
- end
643
+ sleep(wait_time)
648
644
  retries += 1
649
645
  retry
650
- else
646
+ elsif @retry_request_limit_exceeded
651
647
  Fog::Compute::AWS::RequestLimitExceeded.slurp(error, "Max retries exceeded (#{max_retries}) #{match[:code]} => #{match[:message]}")
648
+ else
649
+ Fog::Compute::AWS::RequestLimitExceeded.slurp(error, "#{match[:code]} => #{match[:message]}")
652
650
  end
653
651
  else
654
652
  Fog::Compute::AWS::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
data/lib/fog/aws/models/auto_scaling/group.rb CHANGED
@@ -99,6 +99,16 @@ module Fog
99
99
  reload
100
100
  end
101
101
 
102
+ def set_instance_protection(instance_ids, protected_from_scale_in)
103
+ requires :id
104
+ service.set_instance_protection(
105
+ id,
106
+ 'InstanceIds' => instance_ids,
107
+ 'ProtectedFromScaleIn' => protected_from_scale_in
108
+ )
109
+ reload
110
+ end
111
+
102
112
  def instances
103
113
  Fog::AWS::AutoScaling::Instances.new(:service => service).load(attributes[:instances])
104
114
  end
data/lib/fog/aws/models/compute/flavors.rb CHANGED
@@ -7,10 +7,10 @@ module Fog
7
7
  {
8
8
  :id => 't1.micro',
9
9
  :name => 'Micro Instance',
10
- :bits => 0,
11
- :cores => 2,
10
+ :bits => 32,
11
+ :cores => 1,
12
12
  :disk => 0,
13
- :ram => 613,
13
+ :ram => 658,
14
14
  :ebs_optimized_available => false,
15
15
  :instance_store_volumes => 0
16
16
  },
@@ -20,7 +20,7 @@ module Fog
20
20
  :bits => 64,
21
21
  :cores => 1,
22
22
  :disk => 0,
23
- :ram => 512,
23
+ :ram => 536,
24
24
  :ebs_optimized_available => false,
25
25
  :instance_store_volumes => 0
26
26
  },
@@ -30,7 +30,7 @@ module Fog
30
30
  :bits => 64,
31
31
  :cores => 1,
32
32
  :disk => 0,
33
- :ram => 1024,
33
+ :ram => 1073,
34
34
  :ebs_optimized_available => false,
35
35
  :instance_store_volumes => 0
36
36
  },
@@ -40,7 +40,7 @@ module Fog
40
40
  :bits => 64,
41
41
  :cores => 1,
42
42
  :disk => 0,
43
- :ram => 2048,
43
+ :ram => 2147,
44
44
  :ebs_optimized_available => false,
45
45
  :instance_store_volumes => 0
46
46
  },
@@ -50,7 +50,7 @@ module Fog
50
50
  :bits => 64,
51
51
  :cores => 2,
52
52
  :disk => 0,
53
- :ram => 4096,
53
+ :ram => 4294,
54
54
  :ebs_optimized_available => false,
55
55
  :instance_store_volumes => 0
56
56
  },
@@ -60,7 +60,7 @@ module Fog
60
60
  :bits => 64,
61
61
  :cores => 2,
62
62
  :disk => 0,
63
- :ram => 8192,
63
+ :ram => 8589,
64
64
  :ebs_optimized_available => false,
65
65
  :instance_store_volumes => 0
66
66
  },
@@ -70,7 +70,7 @@ module Fog
70
70
  :bits => 64,
71
71
  :cores => 4,
72
72
  :disk => 0,
73
- :ram => 16384,
73
+ :ram => 17179,
74
74
  :ebs_optimized_available => false,
75
75
  :instance_store_volumes => 0
76
76
  },
@@ -80,7 +80,7 @@ module Fog
80
80
  :bits => 64,
81
81
  :cores => 8,
82
82
  :disk => 0,
83
- :ram => 32768,
83
+ :ram => 34359,
84
84
  :ebs_optimized_available => false,
85
85
  :instance_store_volumes => 0
86
86
  },
@@ -90,7 +90,7 @@ module Fog
90
90
  :bits => 32,
91
91
  :cores => 1,
92
92
  :disk => 160,
93
- :ram => 1740.8,
93
+ :ram => 1825,
94
94
  :ebs_optimized_available => false,
95
95
  :instance_store_volumes => 1
96
96
  },
@@ -98,9 +98,9 @@ module Fog
98
98
  :id => 'm1.medium',
99
99
  :name => 'Medium Instance',
100
100
  :bits => 32,
101
- :cores => 2,
101
+ :cores => 1,
102
102
  :disk => 400,
103
- :ram => 3750,
103
+ :ram => 4026,
104
104
  :ebs_optimized_available => false,
105
105
  :instance_store_volumes => 1
106
106
  },
@@ -108,9 +108,9 @@ module Fog
108
108
  :id => 'm1.large',
109
109
  :name => 'Large Instance',
110
110
  :bits => 64,
111
- :cores => 4,
111
+ :cores => 2,
112
112
  :disk => 850,
113
- :ram => 7680,
113
+ :ram => 8053,
114
114
  :ebs_optimized_available => true,
115
115
  :instance_store_volumes => 2
116
116
  },
@@ -118,19 +118,19 @@ module Fog
118
118
  :id => 'm1.xlarge',
119
119
  :name => 'Extra Large Instance',
120
120
  :bits => 64,
121
- :cores => 8,
121
+ :cores => 4,
122
122
  :disk => 1690,
123
- :ram => 15360,
123
+ :ram => 16106,
124
124
  :ebs_optimized_available => true,
125
125
  :instance_store_volumes => 4
126
126
  },
127
127
  {
128
128
  :id => 'c1.medium',
129
129
  :bits => 32,
130
- :cores => 5,
130
+ :cores => 2,
131
131
  :disk => 350,
132
132
  :name => 'High-CPU Medium',
133
- :ram => 1740.8,
133
+ :ram => 1825,
134
134
  :ebs_optimized_available => false,
135
135
  :instance_store_volumes => 1
136
136
  },
@@ -138,9 +138,9 @@ module Fog
138
138
  :id => 'c1.xlarge',
139
139
  :name => 'High-CPU Extra Large',
140
140
  :bits => 64,
141
- :cores => 20,
141
+ :cores => 8,
142
142
  :disk => 1690,
143
- :ram => 7168,
143
+ :ram => 7516,
144
144
  :ebs_optimized_available => true,
145
145
  :instance_store_volumes => 4
146
146
  },
@@ -150,7 +150,7 @@ module Fog
150
150
  :bits => 64,
151
151
  :cores => 2,
152
152
  :disk => 32,
153
- :ram => 3750,
153
+ :ram => 4026,
154
154
  :ebs_optimized_available => false,
155
155
  :instance_store_volumes => 2
156
156
  },
@@ -160,7 +160,7 @@ module Fog
160
160
  :bits => 64,
161
161
  :cores => 4,
162
162
  :disk => 80,
163
- :ram => 7168,
163
+ :ram => 8053,
164
164
  :ebs_optimized_available => true,
165
165
  :instance_store_volumes => 2
166
166
  },
@@ -170,7 +170,7 @@ module Fog
170
170
  :bits => 64,
171
171
  :cores => 8,
172
172
  :disk => 160,
173
- :ram => 15360,
173
+ :ram => 16106,
174
174
  :ebs_optimized_available => true,
175
175
  :instance_store_volumes => 2
176
176
  },
@@ -180,7 +180,7 @@ module Fog
180
180
  :bits => 64,
181
181
  :cores => 16,
182
182
  :disk => 320,
183
- :ram => 30720,
183
+ :ram => 32212,
184
184
  :ebs_optimized_available => true,
185
185
  :instance_store_volumes => 2
186
186
  },
@@ -188,9 +188,9 @@ module Fog
188
188
  :id => 'c3.8xlarge',
189
189
  :name => 'C3 Eight Extra Large',
190
190
  :bits => 64,
191
- :cores => 16,
191
+ :cores => 32,
192
192
  :disk => 640,
193
- :ram => 61440,
193
+ :ram => 64424,
194
194
  :ebs_optimized_available => false,
195
195
  :instance_store_volumes => 2
196
196
  },
@@ -200,7 +200,7 @@ module Fog
200
200
  :bits => 64,
201
201
  :cores => 2,
202
202
  :disk => 0,
203
- :ram => 3750,
203
+ :ram => 4026,
204
204
  :ebs_optimized_available => true,
205
205
  :instance_store_volumes => 0
206
206
  },
@@ -210,7 +210,7 @@ module Fog
210
210
  :bits => 64,
211
211
  :cores => 4,
212
212
  :disk => 0,
213
- :ram => 7168,
213
+ :ram => 8053,
214
214
  :ebs_optimized_available => true,
215
215
  :instance_store_volumes => 0
216
216
  },
@@ -220,7 +220,7 @@ module Fog
220
220
  :bits => 64,
221
221
  :cores => 8,
222
222
  :disk => 0,
223
- :ram => 15360,
223
+ :ram => 16106,
224
224
  :ebs_optimized_available => true,
225
225
  :instance_store_volumes => 0
226
226
  },
@@ -230,7 +230,7 @@ module Fog
230
230
  :bits => 64,
231
231
  :cores => 16,
232
232
  :disk => 0,
233
- :ram => 30720,
233
+ :ram => 32212,
234
234
  :ebs_optimized_available => true,
235
235
  :instance_store_volumes => 0
236
236
  },
@@ -240,7 +240,7 @@ module Fog
240
240
  :bits => 64,
241
241
  :cores => 36,
242
242
  :disk => 0,
243
- :ram => 61440,
243
+ :ram => 64424,
244
244
  :ebs_optimized_available => true,
245
245
  :instance_store_volumes => 0
246
246
  },
@@ -250,7 +250,7 @@ module Fog
250
250
  :bits => 64,
251
251
  :cores => 2,
252
252
  :disk => 0,
253
- :ram => 4096,
253
+ :ram => 4294,
254
254
  :ebs_optimized_available => true,
255
255
  :instance_store_volumes => 0
256
256
  },
@@ -260,7 +260,7 @@ module Fog
260
260
  :bits => 64,
261
261
  :cores => 4,
262
262
  :disk => 0,
263
- :ram => 8192,
263
+ :ram => 8589,
264
264
  :ebs_optimized_available => true,
265
265
  :instance_store_volumes => 0
266
266
  },
@@ -270,7 +270,7 @@ module Fog
270
270
  :bits => 64,
271
271
  :cores => 8,
272
272
  :disk => 0,
273
- :ram => 16384,
273
+ :ram => 17179,
274
274
  :ebs_optimized_available => true,
275
275
  :instance_store_volumes => 0
276
276
  },
@@ -280,7 +280,7 @@ module Fog
280
280
  :bits => 64,
281
281
  :cores => 16,
282
282
  :disk => 0,
283
- :ram => 32768,
283
+ :ram => 34359,
284
284
  :ebs_optimized_available => true,
285
285
  :instance_store_volumes => 0
286
286
  },
@@ -290,7 +290,7 @@ module Fog
290
290
  :bits => 64,
291
291
  :cores => 36,
292
292
  :disk => 0,
293
- :ram => 73728,
293
+ :ram => 77309,
294
294
  :ebs_optimized_available => true,
295
295
  :instance_store_volumes => 0
296
296
  },
@@ -300,7 +300,7 @@ module Fog
300
300
  :bits => 64,
301
301
  :cores => 72,
302
302
  :disk => 0,
303
- :ram => 147456,
303
+ :ram => 154618,
304
304
  :ebs_optimized_available => true,
305
305
  :instance_store_volumes => 0
306
306
  },
@@ -310,7 +310,7 @@ module Fog
310
310
  :bits => 64,
311
311
  :cores => 8,
312
312
  :disk => 60,
313
- :ram => 15360,
313
+ :ram => 16106,
314
314
  :ebs_optimized_available => true,
315
315
  :instance_store_volumes => 1
316
316
  },
@@ -320,7 +320,7 @@ module Fog
320
320
  :bits => 64,
321
321
  :cores => 32,
322
322
  :disk => 240,
323
- :ram => 61440,
323
+ :ram => 64424,
324
324
  :ebs_optimized_available => true,
325
325
  :instance_store_volumes => 2
326
326
  },
@@ -328,9 +328,9 @@ module Fog
328
328
  :id => 'hs1.8xlarge',
329
329
  :name => 'High Storage Eight Extra Large',
330
330
  :bits => 64,
331
- :cores => 35,
331
+ :cores => 16,
332
332
  :disk => 50331648,
333
- :ram => 119808,
333
+ :ram => 125627,
334
334
  :ebs_optimized_available => false,
335
335
  :instance_store_volumes => 24
336
336
  },
@@ -338,9 +338,9 @@ module Fog
338
338
  :id => 'm2.xlarge',
339
339
  :name => 'High-Memory Extra Large',
340
340
  :bits => 64,
341
- :cores => 6.5,
341
+ :cores => 2,
342
342
  :disk => 420,
343
- :ram => 17510.4,
343
+ :ram => 18360,
344
344
  :ebs_optimized_available => false,
345
345
  :instance_store_volumes => 1
346
346
  },
@@ -348,9 +348,9 @@ module Fog
348
348
  :id => 'm2.2xlarge',
349
349
  :name => 'High Memory Double Extra Large',
350
350
  :bits => 64,
351
- :cores => 13,
351
+ :cores => 4,
352
352
  :disk => 850,
353
- :ram => 35020.8,
353
+ :ram => 36721,
354
354
  :ebs_optimized_available => true,
355
355
  :instance_store_volumes => 1
356
356
  },
@@ -358,9 +358,9 @@ module Fog
358
358
  :id => 'm2.4xlarge',
359
359
  :name => 'High Memory Quadruple Extra Large',
360
360
  :bits => 64,
361
- :cores => 26,
361
+ :cores => 8,
362
362
  :disk => 1690,
363
- :ram => 70041.6,
363
+ :ram => 73443,
364
364
  :ebs_optimized_available => true,
365
365
  :instance_store_volumes => 2
366
366
  },
@@ -368,9 +368,9 @@ module Fog
368
368
  :id => 'cr1.8xlarge',
369
369
  :name => 'High Memory Eight Extra Large',
370
370
  :bits => 64,
371
- :cores => 88,
371
+ :cores => 32,
372
372
  :disk => 240,
373
- :ram => 249856,
373
+ :ram => 261993,
374
374
  :ebs_optimized_available => false,
375
375
  :instance_store_volumes => 2
376
376
  },
@@ -380,7 +380,7 @@ module Fog
380
380
  :bits => 64,
381
381
  :cores => 1,
382
382
  :disk => 4,
383
- :ram => 3840,
383
+ :ram => 4026,
384
384
  :ebs_optimized_available => false,
385
385
  :instance_store_volumes => 1
386
386
  },
@@ -390,7 +390,7 @@ module Fog
390
390
  :bits => 64,
391
391
  :cores => 2,
392
392
  :disk => 32,
393
- :ram => 7680,
393
+ :ram => 8053,
394
394
  :ebs_optimized_available => false,
395
395
  :instance_store_volumes => 1
396
396
  },
@@ -400,7 +400,7 @@ module Fog
400
400
  :bits => 64,
401
401
  :cores => 4,
402
402
  :disk => 80,
403
- :ram => 15360,
403
+ :ram => 16106,
404
404
  :ebs_optimized_available => true,
405
405
  :instance_store_volumes => 2
406
406
  },
@@ -410,7 +410,7 @@ module Fog
410
410
  :bits => 64,
411
411
  :cores => 8,
412
412
  :disk => 160,
413
- :ram => 30720,
413
+ :ram => 32212,
414
414
  :ebs_optimized_available => true,
415
415
  :instance_store_volumes => 2
416
416
  },
@@ -438,9 +438,9 @@ module Fog
438
438
  :id => 'cc2.8xlarge',
439
439
  :name => 'Cluster Compute Eight Extra Large',
440
440
  :bits => 64,
441
- :cores => 88,
441
+ :cores => 32,
442
442
  :disk => 3370,
443
- :ram => 61952,
443
+ :ram => 64961,
444
444
  :ebs_optimized_available => false,
445
445
  :instance_store_volumes => 4
446
446
  },
@@ -460,7 +460,7 @@ module Fog
460
460
  :bits => 64,
461
461
  :cores => 4,
462
462
  :disk => 800,
463
- :ram => 31232,
463
+ :ram => 32749,
464
464
  :ebs_optimized_available => true,
465
465
  :instance_store_volumes => 1
466
466
  },
@@ -470,7 +470,7 @@ module Fog
470
470
  :bits => 64,
471
471
  :cores => 8,
472
472
  :disk => 1600,
473
- :ram => 62464,
473
+ :ram => 65498,
474
474
  :ebs_optimized_available => true,
475
475
  :instance_store_volumes => 2
476
476
  },
@@ -480,7 +480,7 @@ module Fog
480
480
  :bits => 64,
481
481
  :cores => 16,
482
482
  :disk => 3200,
483
- :ram => 124928,
483
+ :ram => 130996,
484
484
  :ebs_optimized_available => true,
485
485
  :instance_store_volumes => 4
486
486
  },
@@ -490,7 +490,7 @@ module Fog
490
490
  :bits => 64,
491
491
  :cores => 32,
492
492
  :disk => 6400,
493
- :ram => 249856,
493
+ :ram => 261993,
494
494
  :ebs_optimized_available => false,
495
495
  :instance_store_volumes => 8
496
496
  },
@@ -500,7 +500,7 @@ module Fog
500
500
  :bits => 64,
501
501
  :cores => 2,
502
502
  :disk => 475,
503
- :ram => 15616,
503
+ :ram => 16374,
504
504
  :ebs_optimized_available => true,
505
505
  :instance_store_volumes => 1
506
506
  },
@@ -510,7 +510,7 @@ module Fog
510
510
  :bits => 64,
511
511
  :cores => 4,
512
512
  :disk => 950,
513
- :ram => 31232,
513
+ :ram => 32749,
514
514
  :ebs_optimized_available => true,
515
515
  :instance_store_volumes => 1
516
516
  },
@@ -520,7 +520,7 @@ module Fog
520
520
  :bits => 64,
521
521
  :cores => 8,
522
522
  :disk => 1900,
523
- :ram => 62464,
523
+ :ram => 65498,
524
524
  :ebs_optimized_available => true,
525
525
  :instance_store_volumes => 1
526
526
  },
@@ -530,7 +530,7 @@ module Fog
530
530
  :bits => 64,
531
531
  :cores => 16,
532
532
  :disk => 3800,
533
- :ram => 124928,
533
+ :ram => 130996,
534
534
  :ebs_optimized_available => true,
535
535
  :instance_store_volumes => 2
536
536
  },
@@ -540,7 +540,7 @@ module Fog
540
540
  :bits => 64,
541
541
  :cores => 32,
542
542
  :disk => 7600,
543
- :ram => 249856,
543
+ :ram => 261993,
544
544
  :ebs_optimized_available => true,
545
545
  :instance_store_volumes => 4
546
546
  },
@@ -548,9 +548,9 @@ module Fog
548
548
  :id => 'i3.16xlarge',
549
549
  :name => 'I3 Sixteen Extra Large',
550
550
  :bits => 64,
551
- :cores => 32,
551
+ :cores => 64,
552
552
  :disk => 15200,
553
- :ram => 499712,
553
+ :ram => 523986,
554
554
  :ebs_optimized_available => true,
555
555
  :instance_store_volumes => 8
556
556
  },
@@ -559,7 +559,7 @@ module Fog
559
559
  :name => "R3 Large",
560
560
  :bits => 64,
561
561
  :cores => 2,
562
- :ram => 15616,
562
+ :ram => 16374,
563
563
  :disk => 32,
564
564
  :ebs_optimized_available => false,
565
565
  :instance_store_volumes => 1
@@ -569,7 +569,7 @@ module Fog
569
569
  :name => "R3 Extra Large",
570
570
  :bits => 64,
571
571
  :cores => 4,
572
- :ram => 31232,
572
+ :ram => 32749,
573
573
  :disk => 80,
574
574
  :ebs_optimized_available => true,
575
575
  :instance_store_volumes => 1
@@ -579,7 +579,7 @@ module Fog
579
579
  :name => "R3 Double Extra Large",
580
580
  :bits => 64,
581
581
  :cores => 8,
582
- :ram => 62464,
582
+ :ram => 65498,
583
583
  :disk => 160,
584
584
  :ebs_optimized_available => true,
585
585
  :instance_store_volumes => 1
@@ -589,7 +589,7 @@ module Fog
589
589
  :name => "R3 Quadruple Extra Large",
590
590
  :bits => 64,
591
591
  :cores => 16,
592
- :ram => 124928,
592
+ :ram => 130996,
593
593
  :disk => 320,
594
594
  :ebs_optimized_available => true,
595
595
  :instance_store_volumes => 1
@@ -599,7 +599,7 @@ module Fog
599
599
  :name => "R3 Eight Extra Large",
600
600
  :bits => 64,
601
601
  :cores => 32,
602
- :ram => 249856,
602
+ :ram => 261993,
603
603
  :disk => 640,
604
604
  :ebs_optimized_available => false,
605
605
  :instance_store_volumes => 2
@@ -609,7 +609,7 @@ module Fog
609
609
  :name => "R4 Large",
610
610
  :bits => 64,
611
611
  :cores => 2,
612
- :ram => 15616,
612
+ :ram => 16374,
613
613
  :disk => 0,
614
614
  :ebs_optimized_available => true,
615
615
  :instance_store_volumes => 0
@@ -619,7 +619,7 @@ module Fog
619
619
  :name => "R4 Extra Large",
620
620
  :bits => 64,
621
621
  :cores => 4,
622
- :ram => 31232,
622
+ :ram => 32749,
623
623
  :disk => 0,
624
624
  :ebs_optimized_available => true,
625
625
  :instance_store_volumes => 0
@@ -629,7 +629,7 @@ module Fog
629
629
  :name => "R4 Double Extra Large",
630
630
  :bits => 64,
631
631
  :cores => 8,
632
- :ram => 62464,
632
+ :ram => 65498,
633
633
  :disk => 0,
634
634
  :ebs_optimized_available => true,
635
635
  :instance_store_volumes => 0
@@ -639,7 +639,7 @@ module Fog
639
639
  :name => "R4 Quadruple Extra Large",
640
640
  :bits => 64,
641
641
  :cores => 16,
642
- :ram => 124928,
642
+ :ram => 130996,
643
643
  :disk => 0,
644
644
  :ebs_optimized_available => true,
645
645
  :instance_store_volumes => 0
@@ -649,7 +649,7 @@ module Fog
649
649
  :name => "R4 Eight Extra Large",
650
650
  :bits => 64,
651
651
  :cores => 32,
652
- :ram => 249856,
652
+ :ram => 261993,
653
653
  :disk => 0,
654
654
  :ebs_optimized_available => true,
655
655
  :instance_store_volumes => 0
@@ -658,8 +658,8 @@ module Fog
658
658
  :id => "r4.16xlarge",
659
659
  :name => "R4 Sixteen Extra Large",
660
660
  :bits => 64,
661
- :cores => 32,
662
- :ram => 499712,
661
+ :cores => 64,
662
+ :ram => 523986,
663
663
  :disk => 0,
664
664
  :ebs_optimized_available => true,
665
665
  :instance_store_volumes => 0
@@ -669,7 +669,7 @@ module Fog
669
669
  :name => "D2 Extra Large",
670
670
  :bits => 64,
671
671
  :cores => 4,
672
- :ram => 31232,
672
+ :ram => 32749,
673
673
  :disk => 6000,
674
674
  :ebs_optimized_available => true,
675
675
  :instance_store_volumes => 3
@@ -679,7 +679,7 @@ module Fog
679
679
  :name => "D2 Double Extra Large",
680
680
  :bits => 64,
681
681
  :cores => 8,
682
- :ram => 62464,
682
+ :ram => 65498,
683
683
  :disk => 12000,
684
684
  :ebs_optimized_available => true,
685
685
  :instance_store_volumes => 6
@@ -689,7 +689,7 @@ module Fog
689
689
  :name => "D2 Quadruple Extra Large",
690
690
  :bits => 64,
691
691
  :cores => 16,
692
- :ram => 124928,
692
+ :ram => 130996,
693
693
  :disk => 24000,
694
694
  :ebs_optimized_available => true,
695
695
  :instance_store_volumes => 12
@@ -699,7 +699,7 @@ module Fog
699
699
  :name => "D2 Eight Extra Large",
700
700
  :bits => 64,
701
701
  :cores => 36,
702
- :ram => 249856,
702
+ :ram => 261993,
703
703
  :disk => 48000,
704
704
  :ebs_optimized_available => true,
705
705
  :instance_store_volumes => 24
@@ -709,7 +709,7 @@ module Fog
709
709
  :name => "M4 Large",
710
710
  :bits => 64,
711
711
  :cores => 2,
712
- :ram => 8192,
712
+ :ram => 8589,
713
713
  :disk => 0,
714
714
  :ebs_optimized_available => true,
715
715
  :instance_store_volumes => 0
@@ -719,7 +719,7 @@ module Fog
719
719
  :name => "M4 Extra Large",
720
720
  :bits => 64,
721
721
  :cores => 4,
722
- :ram => 16384,
722
+ :ram => 17179,
723
723
  :disk => 0,
724
724
  :ebs_optimized_available => true,
725
725
  :instance_store_volumes => 0
@@ -729,7 +729,7 @@ module Fog
729
729
  :name => "M4 Double Extra Large",
730
730
  :bits => 64,
731
731
  :cores => 8,
732
- :ram => 31232,
732
+ :ram => 34359,
733
733
  :disk => 0,
734
734
  :ebs_optimized_available => true,
735
735
  :instance_store_volumes => 0
@@ -739,7 +739,7 @@ module Fog
739
739
  :name => "M4 Quadruple Extra Large",
740
740
  :bits => 64,
741
741
  :cores => 16,
742
- :ram => 62464,
742
+ :ram => 68719,
743
743
  :disk => 0,
744
744
  :ebs_optimized_available => true,
745
745
  :instance_store_volumes => 0
@@ -749,7 +749,7 @@ module Fog
749
749
  :name => "M4 Ten Extra Large",
750
750
  :bits => 64,
751
751
  :cores => 40,
752
- :ram => 163840,
752
+ :ram => 171798,
753
753
  :disk => 0,
754
754
  :ebs_optimized_available => true,
755
755
  :instance_store_volumes => 0
@@ -759,7 +759,7 @@ module Fog
759
759
  :name => "M5 Large",
760
760
  :bits => 64,
761
761
  :cores => 2,
762
- :ram => 8192,
762
+ :ram => 8589,
763
763
  :disk => 0,
764
764
  :ebs_optimized_available => true,
765
765
  :instance_store_volumes => 0
@@ -769,7 +769,7 @@ module Fog
769
769
  :name => "M5 Extra Large",
770
770
  :bits => 64,
771
771
  :cores => 4,
772
- :ram => 16384,
772
+ :ram => 17179,
773
773
  :disk => 0,
774
774
  :ebs_optimized_available => true,
775
775
  :instance_store_volumes => 0
@@ -779,7 +779,7 @@ module Fog
779
779
  :name => "M5 Double Extra Large",
780
780
  :bits => 64,
781
781
  :cores => 8,
782
- :ram => 32768,
782
+ :ram => 34359,
783
783
  :disk => 0,
784
784
  :ebs_optimized_available => true,
785
785
  :instance_store_volumes => 0
@@ -789,7 +789,7 @@ module Fog
789
789
  :name => "M5 Quadruple Extra Large",
790
790
  :bits => 64,
791
791
  :cores => 16,
792
- :ram => 65536,
792
+ :ram => 68719,
793
793
  :disk => 0,
794
794
  :ebs_optimized_available => true,
795
795
  :instance_store_volumes => 0
@@ -799,7 +799,7 @@ module Fog
799
799
  :name => "M5 Twelve Extra Large",
800
800
  :bits => 64,
801
801
  :cores => 48,
802
- :ram => 196608,
802
+ :ram => 206158,
803
803
  :disk => 0,
804
804
  :ebs_optimized_available => true,
805
805
  :instance_store_volumes => 0
@@ -809,7 +809,7 @@ module Fog
809
809
  :name => "M5 Twenty Four Extra Large",
810
810
  :bits => 64,
811
811
  :cores => 96,
812
- :ram => 393216,
812
+ :ram => 412316,
813
813
  :disk => 0,
814
814
  :ebs_optimized_available => true,
815
815
  :instance_store_volumes => 0
@@ -818,7 +818,7 @@ module Fog
818
818
  :id => "p2.xlarge",
819
819
  :name => "General Purpose GPU Extra Large",
820
820
  :bits => 64,
821
- :cores => 2496,
821
+ :cores => 4,
822
822
  :ram => 65498,
823
823
  :disk => 0,
824
824
  :ebs_optimized_available => true,
@@ -828,7 +828,7 @@ module Fog
828
828
  :id => "p2.8xlarge",
829
829
  :name => "General Purpose GPU Eight Extra Large",
830
830
  :bits => 64,
831
- :cores => 19968,
831
+ :cores => 32,
832
832
  :ram => 523986,
833
833
  :disk => 0,
834
834
  :ebs_optimized_available => true,
@@ -838,7 +838,7 @@ module Fog
838
838
  :id => "p2.16xlarge",
839
839
  :name => "General Purpose GPU Sixteen Extra Large",
840
840
  :bits => 64,
841
- :cores => 39936,
841
+ :cores => 64,
842
842
  :ram => 785979,
843
843
  :disk => 0,
844
844
  :ebs_optimized_available => true,
@@ -848,8 +848,8 @@ module Fog
848
848
  :id => "p3.2xlarge",
849
849
  :name => "Tesla GPU Two Extra Large",
850
850
  :bits => 64,
851
- :cores => 5120,
852
- :ram => 6100,
851
+ :cores => 8,
852
+ :ram => 65498,
853
853
  :disk => 0,
854
854
  :ebs_optimized_available => true,
855
855
  :instance_store_volumes => 0
@@ -858,8 +858,8 @@ module Fog
858
858
  :id => "p3.8xlarge",
859
859
  :name => "Tesla GPU Eight Extra Large",
860
860
  :bits => 64,
861
- :cores => 204080,
862
- :ram => 244000,
861
+ :cores => 32,
862
+ :ram => 261993,
863
863
  :disk => 0,
864
864
  :ebs_optimized_available => true,
865
865
  :instance_store_volumes => 0
@@ -868,8 +868,8 @@ module Fog
868
868
  :id => "p3.16xlarge",
869
869
  :name => "Tesla GPU Sixteen Extra Large",
870
870
  :bits => 64,
871
- :cores => 408160,
872
- :ram => 488000,
871
+ :cores => 64,
872
+ :ram => 523986,
873
873
  :disk => 0,
874
874
  :ebs_optimized_available => true,
875
875
  :instance_store_volumes => 0
@@ -880,7 +880,7 @@ module Fog
880
880
  :bits => 64,
881
881
  :cores => 16,
882
882
  :disk => 0,
883
- :ram => 124928,
883
+ :ram => 130996,
884
884
  :ebs_optimized_available => true,
885
885
  :instance_store_volumes => 0
886
886
  },
@@ -890,7 +890,7 @@ module Fog
890
890
  :bits => 64,
891
891
  :cores => 32,
892
892
  :disk => 0,
893
- :ram => 249856,
893
+ :ram => 261993,
894
894
  :ebs_optimized_available => true,
895
895
  :instance_store_volumes => 0
896
896
  },
@@ -900,7 +900,7 @@ module Fog
900
900
  :bits => 64,
901
901
  :cores => 64,
902
902
  :disk => 0,
903
- :ram => 499712,
903
+ :ram => 523986,
904
904
  :ebs_optimized_available => true,
905
905
  :instance_store_volumes => 0
906
906
  }