kotovalexarian-likes-github
/
fog--fog
mirror of https://github.com/fog/fog.git
1
0
Fork 0
Code Releases Activity

Merge pull request #1411 from jtopjian/openstack-image-regions2 

Added multi-region support for OpenStack Image service
This commit is contained in:
Wesley Beary 2012-12-21 12:33:31 -08:00
parent a0d49d3201 9b7be36feb
commit 3c6bf2d552
1 changed files with 4 additions and 1 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,
:openstack_service_type, :openstack_service_name, :openstack_tenant,
:openstack_api_key, :openstack_username,
:current_user, :current_tenant, :openstack_endpoint_type
:current_user, :current_tenant, :openstack_endpoint_type, :openstack_region
model_path 'fog/openstack/models/image'
@ -82,6 +82,7 @@ module Fog
{ :provider => 'openstack',
:openstack_auth_url => @openstack_auth_uri.to_s,
:openstack_auth_token => @auth_token,
:openstack_region => @openstack_region,
:openstack_management_url => @openstack_management_url }
end
end
@ -112,6 +113,7 @@ module Fog
@openstack_service_type = options[:openstack_service_type] || ['image']
@openstack_service_name = options[:openstack_service_name]
@openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL'
@openstack_region = options[:openstack_region]
@connection_options = options[:connection_options] || {}
@ -180,6 +182,7 @@ module Fog
:openstack_api_key => @openstack_api_key,
:openstack_username => @openstack_username,
:openstack_auth_uri => @openstack_auth_uri,
:openstack_region => @openstack_region,
:openstack_auth_token => @openstack_auth_token,
:openstack_service_type => @openstack_service_type,
:openstack_service_name => @openstack_service_name,