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

Merge pull request #2177 from omarreiss/allow-custom-hp-service-type 

allow custom hp_service_type
This commit is contained in:
Rupak Ganguly 2013-10-21 06:49:16 -07:00
parent 7e16079279 b65d6fefeb
commit 58257dd714
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/fog/hp/block_storage.rb
View File

@ -5,7 +5,7 @@ module Fog
class BlockStorage < Fog::Service
requires :hp_secret_key, :hp_tenant_id, :hp_avl_zone
recognizes :hp_auth_uri
recognizes :hp_auth_uri, :hp_service_type
recognizes :persistent, :connection_options
recognizes :hp_use_upass_auth_style, :hp_auth_version, :user_agent
recognizes :hp_access_key, :hp_account_id # :hp_account_id is deprecated use hp_access_key instead
@ -109,7 +109,7 @@ module Fog
auth_version = auth_version.to_s.downcase.to_sym
### Pass the service name for object storage to the authentication call
options[:hp_service_type] = "Block Storage"
options[:hp_service_type] ||= "Block Storage"
@hp_tenant_id = options[:hp_tenant_id]
@hp_avl_zone = options[:hp_avl_zone]

4
lib/fog/hp/cdn.rb
View File

@ -6,7 +6,7 @@ module Fog
class HP < Fog::Service
requires :hp_secret_key, :hp_tenant_id, :hp_avl_zone
recognizes :hp_auth_uri, :hp_cdn_uri
recognizes :hp_auth_uri, :hp_cdn_uri, :hp_service_type
recognizes :hp_use_upass_auth_style, :hp_auth_version, :user_agent
recognizes :persistent, :connection_options
recognizes :hp_access_key, :hp_account_id # :hp_account_id is deprecated use hp_access_key instead
@ -84,7 +84,7 @@ module Fog
auth_version = auth_version.to_s.downcase.to_sym
### Pass the service name for object storage to the authentication call
options[:hp_service_type] = "CDN"
options[:hp_service_type] ||= "CDN"
@hp_tenant_id = options[:hp_tenant_id]
### Make the authentication call

4
lib/fog/hp/compute.rb
View File

@ -6,7 +6,7 @@ module Fog
class HP < Fog::Service
requires :hp_secret_key, :hp_tenant_id, :hp_avl_zone
recognizes :hp_auth_uri
recognizes :hp_auth_uri, :hp_service_type
recognizes :hp_use_upass_auth_style, :hp_auth_version, :user_agent
recognizes :persistent, :connection_options
recognizes :hp_access_key, :hp_account_id # :hp_account_id is deprecated use hp_access_key instead
@ -193,7 +193,7 @@ module Fog
auth_version = auth_version.to_s.downcase.to_sym
### Pass the service name for compute via the options hash
options[:hp_service_type] = "Compute"
options[:hp_service_type] ||= "Compute"
@hp_tenant_id = options[:hp_tenant_id]
### Make the authentication call

6
lib/fog/hp/storage.rb
View File

@ -6,11 +6,11 @@ module Fog
class HP < Fog::Service
requires :hp_secret_key, :hp_tenant_id, :hp_avl_zone
recognizes :hp_auth_uri, :hp_cdn_ssl, :hp_cdn_uri
recognizes :hp_auth_uri, :hp_cdn_ssl, :hp_cdn_uri, :hp_service_type
recognizes :persistent, :connection_options
recognizes :hp_use_upass_auth_style, :hp_auth_version, :user_agent
recognizes :hp_access_key, :hp_account_id # :hp_account_id is deprecated use hp_access_key instead
# :os_account_meta_temp_url_key is an OpenStack specific setting used to generate temporary urls.
recognizes :os_account_meta_temp_url_key
@ -321,7 +321,7 @@ module Fog
auth_version = auth_version.to_s.downcase.to_sym
### Pass the service name for object storage to the authentication call
options[:hp_service_type] = "Object Storage"
options[:hp_service_type] ||= "Object Storage"
@hp_tenant_id = options[:hp_tenant_id]
@hp_avl_zone = options[:hp_avl_zone]
@os_account_meta_temp_url_key = options[:os_account_meta_temp_url_key]