mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-20 11:52:37 +09:00
feature #863: Use action names in messages
This commit is contained in:
1 parent
fa0cdade1d
commit
041e58bbf4
1 file changed
+9
-11
@@ -84,30 +84,28 @@ class ExecDriver < VirtualMachineDriver
|
||||
result, info = vnm.do_action(id, :pre)
|
||||
|
||||
if failed?(result)
|
||||
send_message(:deploy,result,id,info)
|
||||
send_message(ACTION[:deploy],result,id,info)
|
||||
return
|
||||
end
|
||||
|
||||
result, info = do_action("#{dfile} #{host}", id, host, :deploy,
|
||||
:stdin => domain,
|
||||
:ssh_stream => ssh,
|
||||
:respond => false)
|
||||
|
||||
result, domain_id = do_action("#{dfile} #{host}", id, host, :deploy,
|
||||
:stdin => domain,
|
||||
:ssh_stream => ssh,
|
||||
:respond => false)
|
||||
if failed?(result)
|
||||
send_message(:deploy,result,id,info)
|
||||
send_message(ACTION[:deploy],result,id,info)
|
||||
return
|
||||
end
|
||||
|
||||
domain_id = info
|
||||
|
||||
result, info = vnm.do_action(id, :post)
|
||||
|
||||
#TODO: Need to rollback (VM is running) or send success and log error
|
||||
if failed?(result)
|
||||
send_message(:deploy,result,id,info)
|
||||
send_message(ACTION[:deploy],result,id,info)
|
||||
return
|
||||
end
|
||||
|
||||
send_message(:deploy,RESULT[:success],id,domain_id)
|
||||
send_message(ACTION[:deploy],RESULT[:success],id,domain_id)
|
||||
end
|
||||
|
||||
# Basic Domain Management Operations
|
||||
|
||||
Reference in new issue
Block a user