Skip to content
Snippets Groups Projects
Commit 92efae9b authored by Yas Naoi's avatar Yas Naoi
Browse files

by yas: Updated AWS pricing table.

parent 294f2643
No related branches found
No related tags found
No related merge requests found
...@@ -408,25 +408,28 @@ function aws_cloud_aws_cloud_data() { ...@@ -408,25 +408,28 @@ function aws_cloud_aws_cloud_data() {
'instance_types' => array( 'instance_types' => array(
'm1.small' => 'm1.small' , 't1.micro' => 't1.micro' ,
't1.micro' => 't1.micro' , 'm1.small' => 'm1.small' ,
'c1.medium' => 'c1.medium' , 'm1.medium' => 'm1.medium' ,
'm1.large' => 'm1.large' , 'm1.large' => 'm1.large' ,
'm1.xlarge' => 'm1.xlarge' , 'm1.xlarge' => 'm1.xlarge' ,
'c1.xlarge' => 'c1.xlarge' , 'c1.medium' => 'c1.medium' ,
'm2.xlarge' => 'm2.xlarge' , 'c1.xlarge' => 'c1.xlarge' ,
'm2.2xlarge' => 'm2.2xlarge' , 'm2.xlarge' => 'm2.xlarge' ,
'm2.4xlarge' => 'm2.4xlarge' , 'm2.2xlarge' => 'm2.2xlarge' ,
'cc1.4xlarge' => 'cc1.4xlarge', 'm2.4xlarge' => 'm2.4xlarge' ,
'cc2.8xlarge' => 'cc2.8xlarge', 'cc1.4xlarge' => 'cc1.4xlarge' ,
'cg1.4xlarge' => 'cg1.4xlarge', 'cc2.8xlarge' => 'cc2.8xlarge' ,
'cg1.4xlarge' => 'cg1.4xlarge' ,
), ),
/* Pricing data as of 10/02/2011 */ /* Pricing data as of 04/09/2012 */
/* Only reflected for us-east */ /* Only reflected for us-east */
'cloud_pricing_data' => array( 'cloud_pricing_data' => array(
// Micro On-Demand Instances
't1.micro' => array( 't1.micro' => array(
'instance_type' => 't1.micro' , 'instance_type' => 't1.micro' ,
'description' => t('Micro') , 'description' => t('Micro') ,
...@@ -434,65 +437,77 @@ function aws_cloud_aws_cloud_data() { ...@@ -434,65 +437,77 @@ function aws_cloud_aws_cloud_data() {
'windows_cost' => '0.03' , 'windows_cost' => '0.03' ,
), ),
// Standard On-Demand Instances
'm1.small' => array( 'm1.small' => array(
'instance_type' => 'm1.small' , 'instance_type' => 'm1.small' ,
'description' => t('Small (Default)') , 'description' => t('Small (Default)') ,
'linux_or_unix_cost' => '0.085' , 'linux_or_unix_cost' => '0.08' ,
'windows_cost' => '0.12' , 'windows_cost' => '0.115' ,
), ),
'c1.medium' => array(
'instance_type' => 'c1.medium' ,
'description' => t('High-CPU Medium') ,
'linux_or_unix_cost' => '0.17' ,
'windows_cost' => '0.29' ,
),
'm1.medium' => array(
'instance_type' => 'm1.medium' ,
'description' => t('Medium') ,
'linux_or_unix_cost' => '0.16' ,
'windows_cost' => '0.23' ,
),
'm1.large' => array( 'm1.large' => array(
'instance_type' => 'm1.large' , 'instance_type' => 'm1.large' ,
'description' => t('Large') , 'description' => t('Large') ,
'linux_or_unix_cost' => '0.34' , 'linux_or_unix_cost' => '0.32' ,
'windows_cost' => '0.48' , 'windows_cost' => '0.46' ,
), ),
'm1.xlarge' => array( 'm1.xlarge' => array(
'instance_type' => 'm1.xlarge' , 'instance_type' => 'm1.xlarge' ,
'description' => t('Extra Large') , 'description' => t('Extra Large') ,
'linux_or_unix_cost' => '0.68' , 'linux_or_unix_cost' => '0.64' ,
'windows_cost' => '0.96' , 'windows_cost' => '0.92' ,
),
'c1.xlarge' => array(
'instance_type' => 'c1.xlarge' ,
'description' => t('High-CPU Extra Large') ,
'linux_or_unix_cost' => '0.68' ,
'windows_cost' => '1.16' ,
), ),
// Hi-Memory On-Demand Instances
'm2.xlarge' => array( 'm2.xlarge' => array(
'instance_type' => 'm2.xlarge' , 'instance_type' => 'm2.xlarge' ,
'description' => t('Hi-Memory On-Demand Extra Large') , 'description' => t('Hi-Memory On-Demand Extra Large') ,
'linux_or_unix_cost' => '0.50' , 'linux_or_unix_cost' => '0.45' ,
'windows_cost' => '0.62' , 'windows_cost' => '0.57' ,
), ),
'm2.2xlarge' => array( 'm2.2xlarge' => array(
'instance_type' => 'm2.2xlarge' , 'instance_type' => 'm2.2xlarge' ,
'description' => t('Hi-Memory On-Demand Double Extra Large') , 'description' => t('Hi-Memory On-Demand Double Extra Large') ,
'linux_or_unix_cost' => '1.00' , 'linux_or_unix_cost' => '0.9' ,
'windows_cost' => '1.24' , 'windows_cost' => '1.14' ,
), ),
'm2.4xlarge' => array( 'm2.4xlarge' => array(
'instance_type' => 'm2.4xlarge' , 'instance_type' => 'm2.4xlarge' ,
'description' => t('Hi-Memory On-Demand Quadruple Extra Large') , 'description' => t('Hi-Memory On-Demand Quadruple Extra Large') ,
'linux_or_unix_cost' => '2.00' , 'linux_or_unix_cost' => '1.8' ,
'windows_cost' => '2.48' , 'windows_cost' => '2.28' ,
), ),
// Hi-CPU On-Demand Instances
'c1.medium' => array(
'instance_type' => 'c1.medium' ,
'description' => t('High-CPU Medium') ,
'linux_or_unix_cost' => '0.165' ,
'windows_cost' => '0.285' ,
),
'c1.xlarge' => array(
'instance_type' => 'c1.xlarge' ,
'description' => t('High-CPU Extra Large') ,
'linux_or_unix_cost' => '0.68' ,
'windows_cost' => '1.16' ,
),
// Cluster Compute Instances
'cc1.4xlarge' => array( 'cc1.4xlarge' => array(
'instance_type' => 'cc1.4xlarge' , 'instance_type' => 'cc1.4xlarge' ,
'description' => t('Cluster Compute Quadruple Extra Large') , 'description' => t('Cluster Compute Quadruple Extra Large') ,
'linux_or_unix_cost' => '1.30' , 'linux_or_unix_cost' => '1.30' ,
'windows_cost' => '1.61' , 'windows_cost' => '1.61' ,
), ),
...@@ -511,8 +526,7 @@ function aws_cloud_aws_cloud_data() { ...@@ -511,8 +526,7 @@ function aws_cloud_aws_cloud_data() {
'windows_cost' => '2.60' , 'windows_cost' => '2.60' ,
), ),
), ),
); );
/* OpenStack is used for private cloud; so the following pricing info is /* OpenStack is used for private cloud; so the following pricing info is
* just imitaging AWS us-east pricing model. * just imitaging AWS us-east pricing model.
*/ */
......
...@@ -9,12 +9,13 @@ ...@@ -9,12 +9,13 @@
*/ */
/** /**
* Updated by yas 2012/04/09
* Updated by yas 2011/06/07 * Updated by yas 2011/06/07
* Updated by yas 2010/12/26 * Updated by yas 2010/12/26
* Created by yas 2010/12/02 * Created by yas 2010/12/02
*/ */
define('AMAZON_EC2_API_VERSION' , '2011-12-15' ); define('AMAZON_EC2_API_VERSION' , '2012-03-01' );
// us-east-1 // us-east-1
define('AMAZON_EC2_HOST_URI' , 'ec2.amazonaws.com' ); define('AMAZON_EC2_HOST_URI' , 'ec2.amazonaws.com' );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment