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 #1409 from rubiojr/set-custom-endpoint

Browse source 
[openstack|image] Configurable :openstack_endpoint_type
This commit is contained in:
Wesley Beary 2012-12-21 11:06:11 -08:00
commit f237b7ca81
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@ module Fog
recognizes :openstack_auth_token, :openstack_management_url, :persistent, recognizes :openstack_auth_token, :openstack_management_url, :persistent,
:openstack_service_type, :openstack_service_name, :openstack_tenant, :openstack_service_type, :openstack_service_name, :openstack_tenant,
:openstack_api_key, :openstack_username, :openstack_api_key, :openstack_username,
:current_user, :current_tenant :current_user, :current_tenant, :openstack_endpoint_type
model_path 'fog/openstack/models/image' model_path 'fog/openstack/models/image'
@ -111,6 +111,7 @@ module Fog
@openstack_must_reauthenticate = false @openstack_must_reauthenticate = false
@openstack_service_type = options[:openstack_service_type] || ['image'] @openstack_service_type = options[:openstack_service_type] || ['image']
@openstack_service_name = options[:openstack_service_name] @openstack_service_name = options[:openstack_service_name]
@openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL'
@connection_options = options[:connection_options] || {} @connection_options = options[:connection_options] || {}
@ -182,7 +183,7 @@ module Fog
:openstack_auth_token => @openstack_auth_token, :openstack_auth_token => @openstack_auth_token,
:openstack_service_type => @openstack_service_type, :openstack_service_type => @openstack_service_type,
:openstack_service_name => @openstack_service_name, :openstack_service_name => @openstack_service_name,
:openstack_endpoint_type => 'adminURL' :openstack_endpoint_type => @openstack_endpoint_type
} }
credentials = Fog::OpenStack.authenticate_v2(options, @connection_options) credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)