From b94ece2bc60e73b2f1e449fec49d651c3cc2d51c Mon Sep 17 00:00:00 2001 From: Rupak Ganguly Date: Fri, 17 Jun 2011 14:45:49 -0400 Subject: [PATCH] Enable compute service with HP provider. Refactor hp_auth_url into hp_host, hp_port and hp_auth_path to enable flexibility in specifying the host, port and auth path separately. --- lib/fog/providers/hp.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/fog/providers/hp.rb b/lib/fog/providers/hp.rb index 92c04cab5..d723e6578 100644 --- a/lib/fog/providers/hp.rb +++ b/lib/fog/providers/hp.rb @@ -6,12 +6,16 @@ module Fog extend Fog::Provider #service(:cdn, 'cdn/rackspace') - #service(:compute, 'compute/rackspace') + service(:compute, 'compute/hp') service(:storage, 'storage/hp') def self.authenticate(options) scheme = options[:scheme] || "http://" - hp_auth_url = options[:hp_auth_url] || "auth.api.rackspacecloud.com" + #hp_auth_url = options[:hp_auth_url] || "auth.api.rackspacecloud.com" + @hp_host = options[:hp_host] || "auth.api.rackspacecloud.com" + @hp_port = options[:hp_port] || "80" + @hp_auth_path = options[:hp_auth_path] || "auth/v1.0" + hp_auth_url = "#{@hp_host}:#{@hp_port}" connection = Fog::Connection.new(scheme + hp_auth_url) @hp_username = options[:hp_username] @hp_password = options[:hp_password] @@ -21,9 +25,10 @@ module Fog 'X-Auth-Key' => @hp_password, 'X-Auth-User' => @hp_username }, - :host => hp_auth_url, + :host => @hp_host, + :port => @hp_port, :method => 'GET', - :path => 'auth/v1.0' + :path => @hp_auth_path }) response.headers.reject do |key, value| !['X-Server-Management-Url', 'X-Storage-Url', 'X-CDN-Management-Url', 'X-Auth-Token'].include?(key)