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

Missing network init uri

Browse source 
Missing network init uri, got lost probably in cleanup in
83b61986bd
This commit is contained in:
Ladislav Smola 2015-06-29 15:31:34 +02:00
parent 9b8e8e6993
commit 58bf4e1360
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/fog/openstack/core.rb
View file

@ -161,16 +161,15 @@ module Fog
@openstack_must_reauthenticate = false
@auth_token = credentials[:token]
@openstack_management_url = credentials[:server_management_url]
uri = URI.parse(@openstack_management_url)
else
@auth_token = @openstack_auth_token
uri = URI.parse(@openstack_management_url)
end
@openstack_management_uri = URI.parse(@openstack_management_url)
@host = uri.host
@path = uri.path
@port = uri.port
@scheme = uri.scheme
@host = @openstack_management_uri.host
@path = @openstack_management_uri.path
@port = @openstack_management_uri.port
@scheme = @openstack_management_uri.scheme
true
end
end

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

@ -241,7 +241,7 @@ module Fog
@path.sub!(/\/$/, '')
unless @path.match(SUPPORTED_VERSIONS)
@path = "/" + Fog::OpenStack.get_supported_version(SUPPORTED_VERSIONS,
uri,
@openstack_management_uri,
@auth_token,
@connection_options)
end