Merge branch 'master' of opennebula.org:one

This commit is contained in:
Ruben S. Montero committed 2010-12-22 18:12:08 +01:00
commit e61b5a7c72
3 files changed
+12 -2

No files matched your search

+1 -1
View File
@@ -281,6 +281,7 @@ TM_MAD = [
# - SHUTDOWN, after the VM is shutdown
# - STOP, after the VM is stopped (including VM image transfers)
# - DONE, after the VM is deleted or shutdown
# - FAILED, when the VM enters the failed state
# command : path can be absolute or relative to $ONE_LOCATION/share/hooks
# case of self-contained installation or relative to
# /usr/share/one/hooks in case of system-wide installation
@@ -349,4 +350,3 @@ VM_HOOK = [
#AUTH_MAD = [
# executable = "one_auth_mad" ]
+1 -1
View File
@@ -250,7 +250,7 @@ Commands:
user --> Images of the user identified by the username
* top (Lists Images continuously)
onevm top
oneimage top
* show (Gets information about an specific Image)
oneimage show <image_id>
+10
View File
@@ -133,6 +133,16 @@ VirtualMachinePool::VirtualMachinePool(SqlDB * db,
state_hook = true;
}
else if ( on == "FAILED" )
{
VirtualMachineStateHook * hook;
hook = new VirtualMachineStateHook(name, cmd, arg, remote,
VirtualMachine::LCM_INIT, VirtualMachine::FAILED);
add_hook(hook);
state_hook = true;
}
else
{
ostringstream oss;