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

[openstack] remove :host from Excon request params

Browse source
This commit is contained in:
Brian D. Burns 2013-10-11 11:21:56 -04:00
parent 80f150d428
commit fe2b2d9f30
8 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/fog/openstack/compute.rb
View file

@ -342,7 +342,6 @@ module Fog
'Accept' => 'application/json',
'X-Auth-Token' => @auth_token
}.merge!(params[:headers] || {}),
:host => @host,
:path => "#{@path}/#{@tenant_id}/#{params[:path]}",
:query => params[:query]
}))
@ -416,7 +415,7 @@ module Fog
@port = uri.port
@scheme = uri.scheme
# Not all implementations have identity service in the catalog
if @openstack_identity_public_endpoint || @openstack_management_url
@identity_connection = Fog::Connection.new(

3
lib/fog/openstack/identity.rb
View file

@ -192,7 +192,7 @@ module Fog
@connection_options = options[:connection_options] || {}
@openstack_current_user_id = options[:openstack_current_user_id]
@openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL'
@current_user = options[:current_user]
@ -227,7 +227,6 @@ module Fog
'Accept' => 'application/json',
'X-Auth-Token' => @auth_token
}.merge!(params[:headers] || {}),
:host => @host,
:path => "#{@path}/#{params[:path]}"#,
}))
rescue Excon::Errors::Unauthorized => error

3
lib/fog/openstack/image.rb
View file

@ -148,7 +148,6 @@ module Fog
'Content-Type' => 'application/json',
'X-Auth-Token' => @auth_token
}.merge!(params[:headers] || {}),
:host => @host,
:path => "#{@path}/#{params[:path]}"#,
}))
rescue Excon::Errors::Unauthorized => error
@ -186,7 +185,7 @@ module Fog
:openstack_auth_token => @openstack_auth_token,
:openstack_service_type => @openstack_service_type,
:openstack_service_name => @openstack_service_name,
:openstack_endpoint_type => @openstack_endpoint_type
:openstack_endpoint_type => @openstack_endpoint_type
}
credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)

1
lib/fog/openstack/metering.rb
View file

@ -144,7 +144,6 @@ module Fog
'Accept' => 'application/json',
'X-Auth-Token' => @auth_token
}.merge!(params[:headers] || {}),
:host => @host,
:path => "#{@path}/v2/#{params[:path]}"#,
# Causes errors for some requests like tenants?limit=1
# :query => ('ignore_awful_caching' << Time.now.to_i.to_s)

1
lib/fog/openstack/network.rb
View file

@ -235,7 +235,6 @@ module Fog
'Accept' => 'application/json',
'X-Auth-Token' => @auth_token
}.merge!(params[:headers] || {}),
:host => @host,
:path => "#{@path}/#{params[:path]}"#,
}))
rescue Excon::Errors::Unauthorized => error

1
lib/fog/openstack/orchestration.rb
View file

@ -142,7 +142,6 @@ module Fog
'X-Auth-User' => @openstack_username,
'X-Auth-Key' => @openstack_api_key
}.merge!(params[:headers] || {}),
:host => @host,
:path => "#{@path}/#{@tenant_id}/#{params[:path]}",
:query => params[:query]
}))

1
lib/fog/openstack/storage.rb
View file

@ -152,7 +152,6 @@ module Fog
'Accept' => 'application/json',
'X-Auth-Token' => @auth_token
}.merge!(params[:headers] || {}),
:host => @host,
:path => "#{@path}/#{params[:path]}",
}))
rescue Excon::Errors::Unauthorized => error

3
lib/fog/openstack/volume.rb
View file

@ -29,7 +29,7 @@ module Fog
request :list_snapshots
request :get_snapshot_details
request :delete_snapshot
request :update_quota
request :get_quota
request :get_quota_defaults
@ -157,7 +157,6 @@ module Fog
'Accept' => 'application/json',
'X-Auth-Token' => @auth_token
}.merge!(params[:headers] || {}),
:host => @host,
:path => "#{@path}/#{params[:path]}"#,
}))
rescue Excon::Errors::Unauthorized => error