Merge pull request #31992 from notpeter/2015.8

salt-cloud: add D2 and G2 EC2 instance types
This commit is contained in:
Nicole Thomas 2016-03-18 15:37:21 -06:00
commit 398ab909f0

View file

@ -658,6 +658,46 @@ def avail_sizes(call=None):
'ram': '60 GiB'
}
},
'Dense Storage': {
'd2.xlarge': {
'id': 'd2.xlarge',
'cores': '4',
'disk': '6 TiB (3 x 2 TiB hard disk drives)',
'ram': '30.5 GiB'
},
'd2.2xlarge': {
'id': 'd2.2xlarge',
'cores': '8',
'disk': '12 TiB (6 x 2 TiB hard disk drives)',
'ram': '61 GiB'
},
'd2.4xlarge': {
'id': 'd2.4xlarge',
'cores': '16',
'disk': '24 TiB (12 x 2 TiB hard disk drives)',
'ram': '122 GiB'
},
'd2.8xlarge': {
'id': 'd2.8xlarge',
'cores': '36',
'disk': '24 TiB (24 x 2 TiB hard disk drives)',
'ram': '244 GiB'
},
},
'GPU': {
'g2.2xlarge': {
'id': 'g2.2xlarge',
'cores': '8',
'disk': '60 GiB (1 x 60 GiB SSD)',
'ram': '15 GiB'
},
'g2.8xlarge': {
'id': 'g2.8xlarge',
'cores': '32',
'disk': '240 GiB (2 x 120 GiB SSD)',
'ram': '60 GiB'
},
},
'High I/O': {
'i2.xlarge': {
'id': 'i2.xlarge',