You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2012/05/22 22:19:37 UTC
[22/50] [abbrv] git commit: FGCP: Fixed the driver to use :default in
entrypoint configuration
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 <mf...@redhat.com>
Authored: Wed May 16 09:35:31 2012 +0200
Committer: Michal fojtik <mf...@redhat.com>
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}",