Return-Path: X-Original-To: apmail-deltacloud-commits-archive@www.apache.org Delivered-To: apmail-deltacloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2351090FB for ; Thu, 8 Mar 2012 10:43:40 +0000 (UTC) Received: (qmail 68124 invoked by uid 500); 8 Mar 2012 10:43:40 -0000 Delivered-To: apmail-deltacloud-commits-archive@deltacloud.apache.org Received: (qmail 68106 invoked by uid 500); 8 Mar 2012 10:43:39 -0000 Mailing-List: contact commits-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list commits@deltacloud.apache.org Received: (qmail 68080 invoked by uid 99); 8 Mar 2012 10:43:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Mar 2012 10:43:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ED91F6295; Thu, 8 Mar 2012 10:43:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marios@apache.org To: commits@deltacloud.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Add new m1.medium hardware profile to ec2 driver Message-Id: <20120308104338.ED91F6295@tyr.zones.apache.org> Date: Thu, 8 Mar 2012 10:43:38 +0000 (UTC) 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 Authored: Thu Mar 8 11:42:10 2012 +0200 Committer: marios 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