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 authentication endpoints

Browse source
This commit is contained in:
Kyle Rames 2014-05-09 16:44:02 -05:00
parent 44c9ce9eb1
commit 2fd8a9299e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/fog/rackspace/core.rb
View file

@ -101,7 +101,7 @@ module Fog
def self.authenticate(options, connection_options = {})
rackspace_auth_url = options[:rackspace_auth_url]
rackspace_auth_url ||= options[:rackspace_endpoint] == Fog::Compute::RackspaceV2::LON_ENDPOINT ? "lon.auth.api.rackspacecloud.com" : "auth.api.rackspacecloud.com"
rackspace_auth_url ||= options[:rackspace_endpoint] == Fog::Compute::RackspaceV2::LON_ENDPOINT ? UK_AUTH_ENDPOINT : US_AUTH_ENDPOINT
url = rackspace_auth_url.match(/^https?:/) ? \
rackspace_auth_url : 'https://' + rackspace_auth_url
uri = URI.parse(url)

2
tests/rackspace/cdn_tests.rb
View file

@ -132,7 +132,7 @@ Shindo.tests('Fog::CDN::Rackspace', ['rackspace']) do
begin
tests('publish_container').succeeds do
returns(nil, "CDN is not enabled") { container_meta_attributes['X-CDN-Enabled'] }
returns("False", "CDN is not enabled") { container_meta_attributes['X-CDN-Enabled'] }
urls = @cdn.publish_container @directory
returns(true, "hash contains expected urls") { Fog::CDN::Rackspace::Base::URI_HEADERS.values.all? { |url_type| urls[url_type] } }
returns("True", "CDN is enabled") { container_meta_attributes['X-Cdn-Enabled'] }