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/25 09:34:06 UTC
[4/4] git commit: EC2: Fixed the URL in providers to use Deltacloud
class instead of Sinatra::Application
EC2: Fixed the URL in providers to use Deltacloud class instead of Sinatra::Application
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/3c05173a
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/3c05173a
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/3c05173a
Branch: refs/heads/master
Commit: 3c05173a54242116fa29fbc0410110af1944a4f7
Parents: e8c5efe
Author: Michal Fojtik <mf...@redhat.com>
Authored: Thu May 24 16:54:46 2012 +0200
Committer: Michal fojtik <mf...@redhat.com>
Committed: Thu May 24 16:54:46 2012 +0200
----------------------------------------------------------------------
server/lib/deltacloud/drivers/ec2/ec2_driver.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/3c05173a/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 856f159..f7ef826 100644
--- a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
+++ b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
@@ -743,7 +743,7 @@ module Deltacloud
def providers(credentials, opts={})
ec2 = new_client(credentials)
providers = ec2.describe_regions.map{|r| Provider.new( {:id=>r, :name=>r,
- :url=>"#{ENV['API_HOST']}:#{ENV['API_PORT']}#{settings.root_url}\;provider=#{r}" }) }
+ :url=>"#{ENV['API_HOST']}:#{ENV['API_PORT']}#{Deltacloud[:root_url]}\;provider=#{r}" }) }
end
def configured_providers