From eb3bd9e6dfc62a82bf9c36c0b839cbd131af6c2d Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Thu, 28 Oct 2010 20:50:17 +0200 Subject: [PATCH] bug #380: Fixed correct path for read_configuration method --- src/im_mad/im_ssh/one_im_ssh.rb | 2 +- src/mad/ruby/ActionManager.rb | 2 +- src/vmm_mad/ssh/one_vmm_ssh.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/im_mad/im_ssh/one_im_ssh.rb b/src/im_mad/im_ssh/one_im_ssh.rb index 0ab0b31794..57dd1514c8 100755 --- a/src/im_mad/im_ssh/one_im_ssh.rb +++ b/src/im_mad/im_ssh/one_im_ssh.rb @@ -49,7 +49,7 @@ class InformationManager < OpenNebulaDriver @config = read_configuration @hypervisor = hypervisor - @remote_dir = @config['SCRIPTS_REMOTE_DIR'] || '/tmp/one' + @remote_dir = @config['SCRIPTS_REMOTE_DIR'] # register actions register_action(:MONITOR, method("action_monitor")) diff --git a/src/mad/ruby/ActionManager.rb b/src/mad/ruby/ActionManager.rb index a7feb2893c..2c7a1b4cd5 100644 --- a/src/mad/ruby/ActionManager.rb +++ b/src/mad/ruby/ActionManager.rb @@ -183,7 +183,7 @@ private if ENV['ONE_LOCATION'] one_config=ENV['ONE_LOCATION']+'/var/config' else - one_config='/var/log/one/config' + one_config='/var/lib/one/config' end config=Hash.new diff --git a/src/vmm_mad/ssh/one_vmm_ssh.rb b/src/vmm_mad/ssh/one_vmm_ssh.rb index ed37db0fee..014eda5090 100755 --- a/src/vmm_mad/ssh/one_vmm_ssh.rb +++ b/src/vmm_mad/ssh/one_vmm_ssh.rb @@ -47,7 +47,7 @@ class SshDriver < VirtualMachineDriver @config = read_configuration @hypervisor = hypervisor - @remote_dir = @config['SCRIPTS_REMOTE_DIR'] || '/tmp/one' + @remote_dir = @config['SCRIPTS_REMOTE_DIR'] end # ------------------------------------------------------------------------ #