shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Merge branch 'feature-199' of dsa-research.org:one into feature-199

Browse Source
This commit is contained in:
Ruben S. Montero 2010-10-07 18:37:29 +02:00
commit 2efc13e6fb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/im_mad/im_sh/one_im_sh
View File

@ -17,7 +17,7 @@
#--------------------------------------------------------------------------- #
#Setup driver variables
DRIVER_NAME=`basename $1 | cut -d. -f1`
DRIVER_NAME=`basename $0 | cut -d. -f1`
if [ -z "${ONE_LOCATION}" ]; then
DRIVERRC=/etc/one/${DRIVER_NAME}/${DRIVER_NAME}rc

4
src/im_mad/im_sh/one_im_sh.rb
View File

@ -49,7 +49,7 @@ class InformationManager < OpenNebulaDriver
@config = read_configuration
@hypervisor = hypervisor
@cmd_path = "#{ENV['ONE_LOCATION']}/lib/remotes/im/#{hypervisor}.d"
@cmd_path = "#{ENV['ONE_LOCATION']}/lib/remotes/im"
# register actions
register_action(:MONITOR, method("action_monitor"))
@ -63,7 +63,7 @@ class InformationManager < OpenNebulaDriver
log(number, message)
end
cmd_string = "#{@remote_dir}/im/run_probes #{@hypervisor} #{host}"
cmd_string = "#{@cmd_path}/run_probes #{@hypervisor} #{host}"
monitor_exe = LocalCommand.run(cmd_string, host, log_method(id))
if monitor_exe.code == 0

2
src/im_mad/im_ssh/one_im_ssh
View File

@ -26,7 +26,7 @@ done
shift $(($OPTIND - 1))
#Setup driver variables
DRIVER_NAME=`basename $1 | cut -d. -f1`
DRIVER_NAME=`basename $0 | cut -d. -f1`
if [ -z "${ONE_LOCATION}" ]; then
DRIVERRC=/etc/one/${DRIVER_NAME}/${DRIVER_NAME}rc