kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

[rackspace] updating compute and storage to pull service net urls from service catalog

Browse source
This commit is contained in:
Kyle Rames 2013-10-25 12:04:18 -05:00
parent e98fb89882
commit 4671d65770
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/fog/rackspace/compute.rb
View file

@ -240,10 +240,7 @@ module Fog
def endpoint_uri(service_endpoint_url=nil) def endpoint_uri(service_endpoint_url=nil)
return @uri if @uri return @uri if @uri
super(@rackspace_endpoint || service_endpoint_url, :rackspace_compute_v1_url)
@uri = super(@rackspace_endpoint || service_endpoint_url, :rackspace_compute_v1_url)
@uri.host = "snet-#{@uri.host}" if service_net?
@uri
end end
private private

6
lib/fog/rackspace/service.rb
View file

@ -52,6 +52,10 @@ module Fog
response response
end end
def service_net?
false
end
private private
def process_response(response) def process_response(response)
@ -118,7 +122,7 @@ module Fog
end end
def endpoint_uri_v2 def endpoint_uri_v2
@uri = @identity_service.service_catalog.get_endpoint(service_name, region) @uri = @identity_service.service_catalog.get_endpoint(service_name, region, service_net?)
end end
def auth_token def auth_token

5
lib/fog/rackspace/storage.rb
View file

@ -190,10 +190,7 @@ module Fog
def endpoint_uri(service_endpoint_url=nil) def endpoint_uri(service_endpoint_url=nil)
return @uri if @uri return @uri if @uri
super(@rackspace_storage_url || service_endpoint_url, :rackspace_storage_url)
@uri = super(@rackspace_storage_url || service_endpoint_url, :rackspace_storage_url)
@uri.host = "snet-#{@uri.host}" if service_net?
@uri
end end
private private