You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by ma...@apache.org on 2012/03/08 11:43:38 UTC
git commit: Add new m1.medium hardware profile to ec2 driver
Updated Branches:
refs/heads/master a1a15d188 -> f5b4c017f
Add new m1.medium hardware profile to ec2 driver
(http://aws.amazon.com/about-aws/whats-new/2012/03/07/three-new-Amazon-EC2-features/)
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/f5b4c017
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/f5b4c017
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/f5b4c017
Branch: refs/heads/master
Commit: f5b4c017f6d681594d6c7c79c039278825b67d4c
Parents: a1a15d1
Author: marios <ma...@redhat.com>
Authored: Thu Mar 8 11:42:10 2012 +0200
Committer: marios <ma...@redhat.com>
Committed: Thu Mar 8 11:42:10 2012 +0200
----------------------------------------------------------------------
server/lib/deltacloud/drivers/ec2/ec2_driver.rb | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/f5b4c017/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
index 74e110f..52e91c2 100644
--- a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
+++ b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
@@ -58,7 +58,14 @@ module Deltacloud
cpu 1
memory 1.7 * 1024
storage 160
- architecture 'i386'
+ architecture ['i386', 'x86_64']
+ end
+
+ define_hardware_profile('m1.medium') do
+ cpu 2
+ memory 3.75 * 1024
+ storage 410
+ architecture ['i386', 'x86_64']
end
define_hardware_profile('m1.large') do
@@ -79,7 +86,7 @@ module Deltacloud
cpu 5
memory 1.7 * 1024
storage 350
- architecture 'i386'
+ architecture ['i386', 'x86_64']
end
define_hardware_profile('c1.xlarge') do