Resume only VMs running before the reboot

If a user suspend a VM manually, onenode.service must not resume it
automatically.

* scripts/onevm-all: Check if suspended VMs are in the saved list of
  running VMs.

Ref: #20718
This commit is contained in:
Daniel Dehennin 2017-06-07 08:59:09 +02:00
parent e65f054237
commit d9e9d2e81c
1 changed files with 3 additions and 5 deletions

View File

@ -181,7 +181,7 @@ begin
vm_pool = VirtualMachinePool.new(client, USERFLAG) vm_pool = VirtualMachinePool.new(client, USERFLAG)
if File.exist?(RUNVMFILE) if File.exist?(RUNVMFILE)
running_vms = File.open(RUNVMFILE,'r') running_vms = File.readlines(RUNVMFILE)
else else
running_vms = [] running_vms = []
end end
@ -211,11 +211,9 @@ begin
when "suspend" when "suspend"
_do_suspend(vm, options[:wait]) _do_suspend(vm, options[:wait])
when "resume" when "resume"
force = FALSE if running_vms.include?("#{vm.id}\n")
if running_vms.include?('vm.id') _do_resume(vm, options[:wait], TRUE)
force = TRUE
end end
_do_resume(vm, options[:wait], force)
else else
puts("#{vm.name}\t#{vm.status}") puts("#{vm.name}\t#{vm.status}")
end end