mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
[openstack|identity] Updated current user id for identity
This commit is contained in:
parent
4b3cb2a984
commit
df54e750a3
1 changed files with 5 additions and 3 deletions
|
@ -8,7 +8,7 @@ module Fog
|
||||||
requires :openstack_auth_url
|
requires :openstack_auth_url
|
||||||
recognizes :openstack_auth_token, :openstack_management_url, :persistent,
|
recognizes :openstack_auth_token, :openstack_management_url, :persistent,
|
||||||
:openstack_service_name, :openstack_tenant,
|
:openstack_service_name, :openstack_tenant,
|
||||||
:openstack_api_key, :openstack_username
|
:openstack_api_key, :openstack_username, :openstack_current_user_id
|
||||||
|
|
||||||
model_path 'fog/openstack/models/identity'
|
model_path 'fog/openstack/models/identity'
|
||||||
model :tenant
|
model :tenant
|
||||||
|
@ -83,7 +83,6 @@ module Fog
|
||||||
|
|
||||||
def initialize(options={})
|
def initialize(options={})
|
||||||
require 'multi_json'
|
require 'multi_json'
|
||||||
attr_reader :openstack_current_user_id
|
|
||||||
|
|
||||||
@openstack_auth_token = options[:openstack_auth_token]
|
@openstack_auth_token = options[:openstack_auth_token]
|
||||||
|
|
||||||
|
@ -105,6 +104,8 @@ module Fog
|
||||||
|
|
||||||
@connection_options = options[:connection_options] || {}
|
@connection_options = options[:connection_options] || {}
|
||||||
|
|
||||||
|
@openstack_current_user_id = options[:openstack_current_user_id]
|
||||||
|
|
||||||
authenticate
|
authenticate
|
||||||
|
|
||||||
@persistent = options[:persistent] || false
|
@persistent = options[:persistent] || false
|
||||||
|
@ -115,7 +116,8 @@ module Fog
|
||||||
{ :provider => 'openstack',
|
{ :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_management_url => @openstack_management_url }
|
:openstack_management_url => @openstack_management_url,
|
||||||
|
:openstack_current_user_id => @openstack_current_user_id}
|
||||||
end
|
end
|
||||||
|
|
||||||
def reload
|
def reload
|
||||||
|
|
Loading…
Add table
Reference in a new issue