Revision c915a198 snf-cyclades-app/synnefo/logic/servers.py
b/snf-cyclades-app/synnefo/logic/servers.py | ||
---|---|---|
280 | 280 |
not backend.vm_exists_in_backend(vm)): |
281 | 281 |
raise faults.BuildInProgress("Server is being build") |
282 | 282 |
log.info("Deleting VM %s", vm) |
283 |
return backend.delete_instance(vm, shutdown_timeout=None)
|
|
283 |
return backend.delete_instance(vm, shutdown_timeout=shutdown_timeout)
|
|
284 | 284 |
|
285 | 285 |
|
286 | 286 |
@server_command("START") |
... | ... | |
292 | 292 |
@server_command("STOP") |
293 | 293 |
def stop(vm, shutdown_timeout=None): |
294 | 294 |
log.info("Stopping VM %s", vm) |
295 |
return backend.shutdown_instance(vm, shutdown_timeout=None)
|
|
295 |
return backend.shutdown_instance(vm, shutdown_timeout=shutdown_timeout)
|
|
296 | 296 |
|
297 | 297 |
|
298 | 298 |
@server_command("REBOOT") |
Also available in: Unified diff