mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-21 14:50:08 +03:00
B OpenNebula/one#6758: Fix QEMU_GA ping monitoring
(cherry picked from commit f698097708614a4eaaa256875e93ab267760debf)
This commit is contained in:
parent
c4746824d8
commit
383bd5300a
@ -51,7 +51,7 @@ module KVM
|
||||
QEMU_GA = {
|
||||
:enabled => false,
|
||||
:commands => {
|
||||
:vm_qemu_ping => "one-$vm_id \'{\"execute\":\"guest-ping\"}\'"
|
||||
:vm_qemu_ping => "one-$vm_id \'{\"execute\":\"guest-ping\"}\' --timeout 5"
|
||||
}
|
||||
}
|
||||
|
||||
@ -84,6 +84,10 @@ module KVM
|
||||
|
||||
ga_conf_path = "#{__dir__}/../../etc/im/kvm-probes.d/guestagent.conf"
|
||||
QEMU_GA.merge!(YAML.load_file(ga_conf_path))
|
||||
|
||||
QEMU_GA[:commands].each_key do |ga_info|
|
||||
Domain::MONITOR_KEYS << ga_info
|
||||
end
|
||||
rescue StandardError
|
||||
end
|
||||
|
||||
@ -258,14 +262,6 @@ class Domain < BaseDomain
|
||||
''
|
||||
end
|
||||
|
||||
def to_monitor
|
||||
KVM::QEMU_GA[:commands].each_key do |ga_info|
|
||||
MONITOR_KEYS << ga_info
|
||||
end
|
||||
|
||||
super
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
|
Loading…
x
Reference in New Issue
Block a user