lib/torpedo/compute/helper.rb in torpedo-1.0.13 vs lib/torpedo/compute/helper.rb in torpedo-1.0.14

@@ -16,12 +16,12 @@
     if ENV['DEBUG'] and ENV['DEBUG'] == 'true' then
         debug = true
     end
 
     auth_url = ENV['NOVA_URL'] || ENV['OS_AUTH_URL']
-    api_key = ENV['NOVA_API_KEY'] || ENV['OS_AUTH_KEY']
-    username = ENV['NOVA_USERNAME'] || ENV['OS_AUTH_USER']
-    authtenant = ENV['NOVA_PROJECT_ID'] || ENV['OS_AUTH_TENANT']
+    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)
   end