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

B OpenNebula/one#5521: Fix lxd reboot arguments (#1424)

Browse Source 
(cherry picked from commit 9efe7cdd2ce507197528d851d66634bcca996a83)
This commit is contained in:
Daniel Clavijo Coca 2021-09-02 10:45:07 -05:00 committed by Ruben S. Montero
parent 9b19609540
commit e9d32a0c1f
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vmm_mad/exec/one_vmm_exec.rb
View File

@ -1325,12 +1325,12 @@ class ExecDriver < VirtualMachineDriver
{
:driver => :vnm,
:action => :post,
:parameters => [:deploy_info, :host],
:parameters => [:deploy_id, :host],
:fail_actions => [
{
:driver => :vmm,
:action => :cancel,
:parameters => [:deploy_info, :host]
:parameters => [:deploy_id, :host]
}
]
}

6
src/vnm_mad/remotes/lib/nic.rb
View File

@ -118,10 +118,12 @@ module VNMMAD
deploy_id = vm['DEPLOY_ID']
end
return if !deploy_id || !vm.vm_info[:dumpxml].nil?
return if !deploy_id || !vm.vm_info[:dumpxml].nil? || deploy_id.empty?
cmd = "#{@lxc_cmd} config show #{deploy_id}"
config, _e, _s = Open3.capture3(cmd)
config, _e, s = Open3.capture3(cmd)
return unless s.exitstatus.zero?
vm.vm_info[:dumpxml] = YAML.safe_load(config)