Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cloud-3370376
Manage
Activity
Members
Labels
Plan
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Issue forks
cloud-3370376
Commits
92efae9b
Commit
92efae9b
authored
12 years ago
by
Yas Naoi
Browse files
Options
Downloads
Patches
Plain Diff
by yas: Updated AWS pricing table.
parent
294f2643
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/iaas/modules/aws_cloud/aws_cloud.module
+55
-41
55 additions, 41 deletions
modules/iaas/modules/aws_cloud/aws_cloud.module
modules/iaas/modules/aws_cloud/aws_cloud.test.inc
+2
-1
2 additions, 1 deletion
modules/iaas/modules/aws_cloud/aws_cloud.test.inc
with
57 additions
and
42 deletions
modules/iaas/modules/aws_cloud/aws_cloud.module
+
55
−
41
View file @
92efae9b
...
...
@@ -408,25 +408,28 @@ function aws_cloud_aws_cloud_data() {
'instance_types'
=>
array
(
'm1.small'
=>
'm1.small'
,
't1.micro'
=>
't1.micro'
,
'c1.medium'
=>
'c1.medium'
,
'm1.large'
=>
'm1.large'
,
'm1.xlarge'
=>
'm1.xlarge'
,
'c1.xlarge'
=>
'c1.xlarge'
,
'm2.xlarge'
=>
'm2.xlarge'
,
'm2.2xlarge'
=>
'm2.2xlarge'
,
'm2.4xlarge'
=>
'm2.4xlarge'
,
'cc1.4xlarge'
=>
'cc1.4xlarge'
,
'cc2.8xlarge'
=>
'cc2.8xlarge'
,
'cg1.4xlarge'
=>
'cg1.4xlarge'
,
't1.micro'
=>
't1.micro'
,
'm1.small'
=>
'm1.small'
,
'm1.medium'
=>
'm1.medium'
,
'm1.large'
=>
'm1.large'
,
'm1.xlarge'
=>
'm1.xlarge'
,
'c1.medium'
=>
'c1.medium'
,
'c1.xlarge'
=>
'c1.xlarge'
,
'm2.xlarge'
=>
'm2.xlarge'
,
'm2.2xlarge'
=>
'm2.2xlarge'
,
'm2.4xlarge'
=>
'm2.4xlarge'
,
'cc1.4xlarge'
=>
'cc1.4xlarge'
,
'cc2.8xlarge'
=>
'cc2.8xlarge'
,
'cg1.4xlarge'
=>
'cg1.4xlarge'
,
),
/* Pricing data as of
1
0/0
2
/201
1
*/
/* Pricing data as of 0
4
/0
9
/201
2
*/
/* Only reflected for us-east */
'cloud_pricing_data'
=>
array
(
// Micro On-Demand Instances
't1.micro'
=>
array
(
'instance_type'
=>
't1.micro'
,
'description'
=>
t
(
'Micro'
)
,
...
...
@@ -434,65 +437,77 @@ function aws_cloud_aws_cloud_data() {
'windows_cost'
=>
'0.03'
,
),
// Standard On-Demand Instances
'm1.small'
=>
array
(
'instance_type'
=>
'm1.small'
,
'description'
=>
t
(
'Small (Default)'
)
,
'linux_or_unix_cost'
=>
'0.08
5
'
,
'windows_cost'
=>
'0.1
2'
,
'linux_or_unix_cost'
=>
'0.08'
,
'windows_cost'
=>
'0.1
15'
,
),
'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
(
'instance_type'
=>
'm1.large'
,
'description'
=>
t
(
'Large'
)
,
'linux_or_unix_cost'
=>
'0.3
4
'
,
'windows_cost'
=>
'0.4
8
'
,
'linux_or_unix_cost'
=>
'0.3
2
'
,
'windows_cost'
=>
'0.4
6
'
,
),
'm1.xlarge'
=>
array
(
'instance_type'
=>
'm1.xlarge'
,
'description'
=>
t
(
'Extra Large'
)
,
'linux_or_unix_cost'
=>
'0.68'
,
'windows_cost'
=>
'0.96'
,
),
'c1.xlarge'
=>
array
(
'instance_type'
=>
'c1.xlarge'
,
'description'
=>
t
(
'High-CPU Extra Large'
)
,
'linux_or_unix_cost'
=>
'0.68'
,
'windows_cost'
=>
'1.16'
,
'linux_or_unix_cost'
=>
'0.64'
,
'windows_cost'
=>
'0.92'
,
),
// Hi-Memory On-Demand Instances
'm2.xlarge'
=>
array
(
'instance_type'
=>
'm2.xlarge'
,
'description'
=>
t
(
'Hi-Memory On-Demand Extra Large'
)
,
'linux_or_unix_cost'
=>
'0.5
0
'
,
'windows_cost'
=>
'0.
62
'
,
'linux_or_unix_cost'
=>
'0.
4
5'
,
'windows_cost'
=>
'0.
57
'
,
),
'm2.2xlarge'
=>
array
(
'instance_type'
=>
'm2.2xlarge'
,
'description'
=>
t
(
'Hi-Memory On-Demand Double Extra Large'
)
,
'linux_or_unix_cost'
=>
'
1.00'
,
'windows_cost'
=>
'1.
2
4'
,
'linux_or_unix_cost'
=>
'
0.9'
,
'windows_cost'
=>
'1.
1
4'
,
),
'm2.4xlarge'
=>
array
(
'instance_type'
=>
'm2.4xlarge'
,
'description'
=>
t
(
'Hi-Memory On-Demand Quadruple Extra Large'
)
,
'linux_or_unix_cost'
=>
'
2.00'
,
'windows_cost'
=>
'2.
4
8'
,
'linux_or_unix_cost'
=>
'
1.8'
,
'windows_cost'
=>
'2.
2
8'
,
),
// 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
(
'instance_type'
=>
'cc1.4xlarge'
,
'description'
=>
t
(
'Cluster Compute Quadruple Extra Large'
)
,
'description'
=>
t
(
'Cluster Compute Quadruple Extra Large'
)
,
'linux_or_unix_cost'
=>
'1.30'
,
'windows_cost'
=>
'1.61'
,
),
...
...
@@ -511,8 +526,7 @@ function aws_cloud_aws_cloud_data() {
'windows_cost'
=>
'2.60'
,
),
),
);
);
/* OpenStack is used for private cloud; so the following pricing info is
* just imitaging AWS us-east pricing model.
*/
...
...
This diff is collapsed.
Click to expand it.
modules/iaas/modules/aws_cloud/aws_cloud.test.inc
+
2
−
1
View file @
92efae9b
...
...
@@ -9,12 +9,13 @@
*/
/**
* Updated by yas 2012/04/09
* Updated by yas 2011/06/07
* Updated by yas 2010/12/26
* Created by yas 2010/12/02
*/
define
(
'AMAZON_EC2_API_VERSION'
,
'201
1-12-15
'
);
define
(
'AMAZON_EC2_API_VERSION'
,
'201
2-03-01
'
);
// us-east-1
define
(
'AMAZON_EC2_HOST_URI'
,
'ec2.amazonaws.com'
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment