From 410298fd41c5b598d53a6580631620be20ab8e14 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Tue, 18 Nov 2014 18:56:26 +0100 Subject: [PATCH] Feature #3331: Fix for vCenter monitorization and in error break (cherry picked from commit 7d94b9be2644d04aa17bca383d9d3e6df6145596) --- src/im_mad/remotes/vcenter.d/vcenter.rb | 1 - src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/im_mad/remotes/vcenter.d/vcenter.rb b/src/im_mad/remotes/vcenter.d/vcenter.rb index dffa53efff..52f166c8b8 100755 --- a/src/im_mad/remotes/vcenter.d/vcenter.rb +++ b/src/im_mad/remotes/vcenter.d/vcenter.rb @@ -25,7 +25,6 @@ else end $: << RUBY_LIB_LOCATION -$: << "../../vmm/vcenter/" require 'vcenter_driver' diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index d1a8740a45..e8ea22d985 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -239,7 +239,7 @@ class VIClient config = system.get_configuration() if ::OpenNebula.is_error?(config) - raise "Error getting oned configuration : #{rc.message}" + raise "Error getting oned configuration : #{config.message}" end @token = config["ONE_KEY"]