From ef6fe4a3bb0020d505ca300f5c90796987a8a2e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 26 Nov 2015 16:17:59 +0100 Subject: [PATCH] Bug #4196: Copy one_auth initialization from client.rb (cherry picked from commit 1cc56deab1351d5ce400fb1fecbe9c3e91109d7f) --- src/oca/ruby/opennebula/oneflow_client.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/oca/ruby/opennebula/oneflow_client.rb b/src/oca/ruby/opennebula/oneflow_client.rb index 7cc0b430d4..1faebeeb84 100644 --- a/src/oca/ruby/opennebula/oneflow_client.rb +++ b/src/oca/ruby/opennebula/oneflow_client.rb @@ -307,11 +307,15 @@ module Service if @username.nil? && @password.nil? if ENV["ONE_AUTH"] and !ENV["ONE_AUTH"].empty? and File.file?(ENV["ONE_AUTH"]) one_auth = File.read(ENV["ONE_AUTH"]) - elsif File.file?(ENV["HOME"]+"/.one/one_auth") + elsif ENV["HOME"] and File.file?(ENV["HOME"]+"/.one/one_auth") one_auth = File.read(ENV["HOME"]+"/.one/one_auth") + elsif File.file?("/var/lib/one/.one/one_auth") + one_auth = File.read("/var/lib/one/.one/one_auth") + else + raise "ONE_AUTH file not present" end - one_auth.rstrip! + one_auth = one_auth.rstrip @username, @password = one_auth.split(':') end