lib/torpedo/compute/helper.rb in torpedo-1.0.15 vs lib/torpedo/compute/helper.rb in torpedo-1.0.16

@@ -25,11 +25,24 @@
     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']
+    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)
+    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
+    )
+
   end
 
   def self.get_image_ref(conn)
 
     image_ref = IMAGE_REF