Return-Path: X-Original-To: apmail-incubator-deltacloud-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-deltacloud-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 155437D51 for ; Tue, 1 Nov 2011 10:59:17 +0000 (UTC) Received: (qmail 26552 invoked by uid 500); 1 Nov 2011 10:59:17 -0000 Delivered-To: apmail-incubator-deltacloud-dev-archive@incubator.apache.org Received: (qmail 26530 invoked by uid 500); 1 Nov 2011 10:59:16 -0000 Mailing-List: contact deltacloud-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: deltacloud-dev@incubator.apache.org Delivered-To: mailing list deltacloud-dev@incubator.apache.org Received: (qmail 26522 invoked by uid 99); 1 Nov 2011 10:59:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Nov 2011 10:59:16 +0000 X-ASF-Spam-Status: No, hits=-5.0 required=5.0 tests=RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of marios@redhat.com designates 209.132.183.28 as permitted sender) Received: from [209.132.183.28] (HELO mx1.redhat.com) (209.132.183.28) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Nov 2011 10:59:10 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pA1AwogA004394 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 1 Nov 2011 06:58:50 -0400 Received: from name.redhat.com (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id pA1AwjBL014158 for ; Tue, 1 Nov 2011 06:58:48 -0400 From: marios@redhat.com To: deltacloud-dev@incubator.apache.org Subject: [PATCH] Fix for bugzilla 725646 Date: Tue, 1 Nov 2011 12:58:43 +0200 Message-Id: <1320145123-5803-2-git-send-email-marios@redhat.com> In-Reply-To: <1320145123-5803-1-git-send-email-marios@redhat.com> References: <1320145123-5803-1-git-send-email-marios@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 From: marios https://bugzilla.redhat.com/show_bug.cgi?id=725646 When you create a bucket in the default region 'us-east-1', specifying the bucket location as 'us-east-1' causes S3 to return an error. Check if location is 'us-east-1' and if so remove this param before calling to S3. Signed-off-by: marios --- server/lib/deltacloud/drivers/ec2/ec2_driver.rb | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb index 753a2aa..dd52fa8 100644 --- a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb +++ b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb @@ -372,7 +372,8 @@ module Deltacloud safely do s3_client = new_client(credentials, :s3) bucket_location = opts['location'] - if (bucket_location && bucket_location.size >0) + if (bucket_location && bucket_location.size >0 && + (not bucket_location.eql?(DEFAULT_REGION)) ) bucket = Aws::S3::Bucket.create(s3_client, name, true, nil, :location => bucket_location) else bucket = Aws::S3::Bucket.create(s3_client, name, true) -- 1.7.6.4