lib/fog/openstack/compute.rb in fog-1.21.0 vs lib/fog/openstack/compute.rb in fog-1.22.0
- old
+ new
@@ -318,11 +318,11 @@
@current_tenant = options[:current_tenant]
authenticate
@persistent = options[:persistent] || false
- @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+ @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def credentials
{ :provider => 'openstack',
:openstack_auth_url => @openstack_auth_uri.to_s,
@@ -388,11 +388,11 @@
:openstack_service_name => @openstack_service_name,
:openstack_identity_service_type => @openstack_identity_service_type,
:openstack_endpoint_type => @openstack_endpoint_type
}
- if @openstack_auth_uri.path =~ /\/v2.0\//
+ if @openstack_auth_uri.path =~ /\/v2.0/
credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
else
credentials = Fog::OpenStack.authenticate_v1(options, @connection_options)
end
@@ -420,10 +420,10 @@
@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::XML::Connection.new(
+ @identity_connection = Fog::Core::Connection.new(
@openstack_identity_public_endpoint || @openstack_management_url,
false, @connection_options)
end
true