From 58bf4e13605fc69a88c3241900b7bf9bff4bf4e6 Mon Sep 17 00:00:00 2001 From: Ladislav Smola Date: Mon, 29 Jun 2015 15:31:34 +0200 Subject: [PATCH] Missing network init uri Missing network init uri, got lost probably in cleanup in https://github.com/fog/fog/commit/83b61986bd2787dd22dc8967f28d0c78d8752aff --- lib/fog/openstack/core.rb | 11 +++++------ lib/fog/openstack/network.rb | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb index dca9898e4..27c8333e3 100644 --- a/lib/fog/openstack/core.rb +++ b/lib/fog/openstack/core.rb @@ -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 diff --git a/lib/fog/openstack/network.rb b/lib/fog/openstack/network.rb index 8f551d1a7..5091a213e 100644 --- a/lib/fog/openstack/network.rb +++ b/lib/fog/openstack/network.rb @@ -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