openstack-compute 1.1.7 → 1.1.8

data/VERSION

@@ -1 +1 @@
-1.1.7
+1.1.8

data/lib/openstack/compute/authentication.rb

@@ -36,7 +36,14 @@ module Compute
       
       @uri = String.new
 
-      auth_data = JSON.generate({ "auth" =>  { "passwordCredentials" => { "username" => connection.authuser, "password" => connection.authkey }, "tenantName" => connection.authtenant}})
+      if connection.auth_method == "password"
+        auth_data = JSON.generate({ "auth" =>  { "passwordCredentials" => { "username" => connection.authuser, "password" => connection.authkey }, "tenantName" => connection.authtenant}})
+      elsif connection.auth_method == "rax-kskey"
+        auth_data = JSON.generate({"auth" => {"RAX-KSKEY:apiKeyCredentials" => {"username" => connection.authuser, "apiKey" => connection.authkey}}})
+      else
+        raise Exception::InvalidArgument, "Unrecognized auth method #{connection.auth_method}"
+      end
+
       response = server.post(connection.auth_path.chomp("/")+"/tokens", auth_data, {'Content-Type' => 'application/json'})
       if (response.code =~ /^20./)
         resp_data=JSON.parse(response.body)

data/lib/openstack/compute/connection.rb

@@ -5,6 +5,7 @@ module Compute
     attr_reader   :authuser
     attr_reader   :authtenant
     attr_reader   :authkey
+    attr_reader   :auth_method
     attr_accessor :authtoken
     attr_accessor :authok
     attr_accessor :svrmgmthost
@@ -42,6 +43,7 @@ module Compute
       @authkey = options[:api_key] || (raise Exception::MissingArgument, "Must supply an :api_key")
       @auth_url = options[:auth_url] || (raise Exception::MissingArgument, "Must supply an :auth_url")
       @authtenant = options[:authtenant] || @authuser
+      @auth_method = options[:auth_method] || "password"
       @service_name = options[:service_name] || nil
       @service_type = options[:service_type] || "compute"
       @region = options[:region] || @region = nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openstack-compute
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 1
-  - 7
-  version: 1.1.7
+  - 8
+  version: 1.1.8
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-17 00:00:00 Z
+date: 2012-03-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json