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 586D897F7 for ; Tue, 22 May 2012 20:19:40 +0000 (UTC) Received: (qmail 32561 invoked by uid 500); 22 May 2012 20:19:40 -0000 Delivered-To: apmail-deltacloud-commits-archive@deltacloud.apache.org Received: (qmail 32503 invoked by uid 500); 22 May 2012 20:19:40 -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 31888 invoked by uid 99); 22 May 2012 20:19: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; Tue, 22 May 2012 20:19:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 991AC17529; Tue, 22 May 2012 20:19:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mfojtik@apache.org To: commits@deltacloud.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [22/50] [abbrv] git commit: FGCP: Fixed the driver to use :default in entrypoint configuration Message-Id: <20120522201937.991AC17529@tyr.zones.apache.org> Date: Tue, 22 May 2012 20:19:37 +0000 (UTC) FGCP: Fixed the driver to use :default in entrypoint configuration Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/7c0d3911 Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/7c0d3911 Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/7c0d3911 Branch: refs/heads/master Commit: 7c0d3911d5f3d2836c9118d97648152710c55d86 Parents: 7885d39 Author: Michal Fojtik Authored: Wed May 16 09:35:31 2012 +0200 Committer: Michal fojtik Committed: Tue May 22 22:17:37 2012 +0200 ---------------------------------------------------------------------- server/lib/deltacloud/drivers/fgcp/fgcp_client.rb | 2 +- server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltacloud/blob/7c0d3911/server/lib/deltacloud/drivers/fgcp/fgcp_client.rb ---------------------------------------------------------------------- diff --git a/server/lib/deltacloud/drivers/fgcp/fgcp_client.rb b/server/lib/deltacloud/drivers/fgcp/fgcp_client.rb index 534979d..c544998 100644 --- a/server/lib/deltacloud/drivers/fgcp/fgcp_client.rb +++ b/server/lib/deltacloud/drivers/fgcp/fgcp_client.rb @@ -35,7 +35,7 @@ class FGCPClient @locale = locale cert.subject.to_s =~ /\b[Cc]=(\w\w)\b/ country = $1.downcase - endpoint = Deltacloud::Drivers::driver_config[:fgcp][:entrypoints][country] unless endpoint + endpoint = Deltacloud::Drivers::driver_config[:fgcp][:entrypoints][:default][country] unless endpoint raise "API endpoint not found for region #{country}" if endpoint.nil? #proxy settings: http://git-wip-us.apache.org/repos/asf/deltacloud/blob/7c0d3911/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb ---------------------------------------------------------------------- diff --git a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb index 6f8b9bd..0729ae4 100644 --- a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb +++ b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb @@ -1136,7 +1136,7 @@ eofwopxml cert, key = convert_credentials(credentials) cert.subject.to_s =~ /\b[Cc]=(\w\w)\b/ country = $1.downcase - endpoint = Deltacloud::Drivers::driver_config[:fgcp][:entrypoints][country] + endpoint = Deltacloud::Drivers::driver_config[:fgcp][:entrypoints][:default][country] [ Provider.new( :id => "fgcp-#{country}",