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

Merge pull request #3659 from Ladas/openstack_missing_passing_of_unscoped_token

Browse source 
Openstack missing passing of unscoped_token
This commit is contained in:
Wesley Beary 2015-08-14 10:13:42 -05:00
commit 03c410b9a0
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,13 +97,15 @@ module Fog
end end
def credentials def credentials
options = { :provider => 'openstack', options = {
:provider => 'openstack',
:openstack_auth_url => @openstack_auth_uri.to_s, :openstack_auth_url => @openstack_auth_uri.to_s,
:openstack_auth_token => @auth_token, :openstack_auth_token => @auth_token,
:openstack_identity_endpoint => @openstack_identity_public_endpoint, :openstack_identity_endpoint => @openstack_identity_public_endpoint,
:current_user => @current_user, :current_user => @current_user,
:current_user_id => @current_user_id, :current_user_id => @current_user_id,
:current_tenant => @current_tenant } :current_tenant => @current_tenant,
:unscoped_token => @unscoped_token}
openstack_options.merge options openstack_options.merge options
end end
@ -139,6 +141,7 @@ module Fog
@openstack_must_reauthenticate = false @openstack_must_reauthenticate = false
@auth_token = credentials[:token] @auth_token = credentials[:token]
@openstack_management_url = credentials[:server_management_url] @openstack_management_url = credentials[:server_management_url]
@unscoped_token = credentials[:unscoped_token]
else else
@auth_token = @openstack_auth_token @auth_token = @openstack_auth_token
end end