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

[openstack|image] Update Image Service Authentication Options

Browse source 
Signed-off-by: Nelvin Driz <nelvindriz@live.com>
This commit is contained in:
Nelvin Driz 2012-03-20 16:52:14 +08:00
parent 33471086de
commit 9a0a5f2da2
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/fog/openstack.rb
View file

@ -100,6 +100,7 @@ module Fog
req_body['auth']['tenantName'] = @openstack_tenant if @openstack_tenant req_body['auth']['tenantName'] = @openstack_tenant if @openstack_tenant
body = retrieve_tokens_v2(connection, req_body, uri) body = retrieve_tokens_v2(connection, req_body, uri)
svc = body['access']['serviceCatalog']. svc = body['access']['serviceCatalog'].
detect{|x| @service_name.include?(x['type']) } detect{|x| @service_name.include?(x['type']) }
identity_svc = body['access']['serviceCatalog']. identity_svc = body['access']['serviceCatalog'].

6
lib/fog/openstack/image.rb
View file

@ -94,10 +94,11 @@ module Fog
raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" unless missing_credentials.empty? raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" unless missing_credentials.empty?
end end
@openstack_auth_uri = URI.parse(options[:openstack_auth_url]) @openstack_tenant = options[:openstack_tenant]
@openstack_auth_uri = URI.parse(options[:openstack_auth_url])
@openstack_management_url = options[:openstack_management_url] @openstack_management_url = options[:openstack_management_url]
@openstack_must_reauthenticate = false @openstack_must_reauthenticate = false
@openstack_service_name = options[:openstack_service_name] || ['image'] @openstack_service_name = options[:openstack_service_name] || ['image']
@connection_options = options[:connection_options] || {} @connection_options = options[:connection_options] || {}
@ -157,6 +158,7 @@ module Fog
def authenticate def authenticate
if @openstack_must_reauthenticate || @openstack_auth_token.nil? if @openstack_must_reauthenticate || @openstack_auth_token.nil?
options = { options = {
:openstack_tenant => @openstack_tenant,
:openstack_api_key => @openstack_api_key, :openstack_api_key => @openstack_api_key,
:openstack_username => @openstack_username, :openstack_username => @openstack_username,
:openstack_auth_uri => @openstack_auth_uri, :openstack_auth_uri => @openstack_auth_uri,