diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-08 02:49:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-08 02:49:56 +0000 |
| commit | e9c25c5a7370b97caf00309fdc562b6787366f09 (patch) | |
| tree | 73cf9e3e1b32c4d0f405292abea683b7021d91c0 | |
| parent | 994377d1b95d88b9e0c638d1d8c6ea0a47a7f244 (diff) | |
| parent | 0098f12e8b1f035c7ecdb952cfcd4bbae86b6246 (diff) | |
Merge "libvirt: ignore NOSTATE in resume_state_on_host_boot() method."
| -rwxr-xr-x | nova/virt/libvirt/driver.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index a0d2d0a7b..e40c70ec6 100755 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -1435,6 +1435,7 @@ class LibvirtDriver(driver.ComputeDriver): ignored_states = (power_state.RUNNING, power_state.SUSPENDED, + power_state.NOSTATE, power_state.PAUSED) if state in ignored_states: |