torpedo 1.0.14 → 1.0.15

data/CHANGELOG

@@ -1,3 +1,6 @@
+* Fri Mar 16 2012 Dan Prince <dprince@redhat.com> - 1.0.15
+  -Set auth_method = 'rax-kskey' if NOVA_RAX_AUTH is set.
+
 * Fri Feb 24 2012 Dan Prince <dprince@redhat.com> - 1.0.14
   -Update OS_ variables to match Openstack standard.
    OS_AUTH_KEY is now OS_PASSWORD

data/VERSION

@@ -1 +1 @@
-1.0.14
+1.0.15

data/lib/torpedo/compute/helper.rb

@@ -17,13 +17,18 @@ module Helper
         debug = true
     end
 
+    auth_method = 'password'
+    if ENV['NOVA_RAX_AUTH'] and ENV['NOVA_RAX_AUTH'] == '1' then
+      auth_method = 'rax-kskey'
+    end
+
     auth_url = ENV['NOVA_URL'] || ENV['OS_AUTH_URL']
     api_key = ENV['NOVA_API_KEY'] || ENV['OS_PASSWORD']
     username = ENV['NOVA_USERNAME'] || ENV['OS_USERNAME']
     authtenant = ENV['NOVA_PROJECT_ID'] || ENV['OS_TENANT_NAME']
     region = ENV['NOVA_REGION_NAME'] || ENV['OS_AUTH_REGION']
 
-    OpenStack::Compute::Connection.new(:username => username, :api_key => api_key, :auth_url => auth_url, :region => region, :authtenant => authtenant, :is_debug => debug)
+    OpenStack::Compute::Connection.new(:username => username, :api_key => api_key, :auth_url => auth_url, :region => region, :authtenant => authtenant, :is_debug => debug, :auth_method => auth_method)
   end
 
   def self.get_image_ref(conn)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: torpedo
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 1
   - 0
-  - 14
-  version: 1.0.14
+  - 15
+  version: 1.0.15
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-25 00:00:00 Z
+date: 2012-03-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement