torpedo 1.0.15 → 1.0.16

data/CHANGELOG

@@ -1,3 +1,7 @@
+* Mon Apr 2 2012 Dan Prince <dprince@redhat.com> - 1.0.16
+  -Add NOVA_SERVICE_NAME env setting (defaults is nil)
+  -Add NOVA_SERVICE_TYPE env setting (default is 'compute')
+
 * Fri Mar 16 2012 Dan Prince <dprince@redhat.com> - 1.0.15
   -Set auth_method = 'rax-kskey' if NOVA_RAX_AUTH is set.
 

data/VERSION

@@ -1 +1 @@
-1.0.15
+1.0.16

data/lib/torpedo/compute/helper.rb

@@ -27,8 +27,21 @@ module Helper
     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']
+    service_type = ENV['NOVA_SERVICE_TYPE'] || "compute"
+    service_name = ENV['NOVA_SERVICE_NAME'] #nil by default
+
+    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,
+        :service_name => service_name,
+        :service_type => service_type
+    )
 
-    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: 9
+  hash: 55
   prerelease: 
   segments: 
   - 1
   - 0
-  - 15
-  version: 1.0.15
+  - 16
+  version: 1.0.16
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-16 00:00:00 Z
+date: 2012-04-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement