diff options
| author | Josh Kearney <josh.kearney@rackspace.com> | 2010-12-16 21:38:52 +0000 |
|---|---|---|
| committer | Tarmac <> | 2010-12-16 21:38:52 +0000 |
| commit | cd460a1f661eea7e050891f50a8218fdf24f2c6f (patch) | |
| tree | 585a70182db79365cf8e9b122ad5328efbb9755e | |
| parent | d67b9f7b8b1fb7d73ad08a04c6ee2d98fc9037d8 (diff) | |
| parent | e5a3d993cb13c8dc5e984a67521f77ce8fdf8e4c (diff) | |
| download | nova-cd460a1f661eea7e050891f50a8218fdf24f2c6f.tar.gz nova-cd460a1f661eea7e050891f50a8218fdf24f2c6f.tar.xz nova-cd460a1f661eea7e050891f50a8218fdf24f2c6f.zip | |
Put flags back in nova.virt.xenapi/vm_utils.
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index dde138404..2f5d78e75 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -23,6 +23,7 @@ import logging import urllib from xml.dom import minidom +from nova import flags from nova import utils from nova.auth.manager import AuthManager from nova.compute import instance_types @@ -30,6 +31,8 @@ from nova.compute import power_state from nova.virt import images +FLAGS = flags.FLAGS + XENAPI_POWER_STATE = { 'Halted': power_state.SHUTDOWN, 'Running': power_state.RUNNING, @@ -37,7 +40,6 @@ XENAPI_POWER_STATE = { 'Suspended': power_state.SHUTDOWN, # FIXME 'Crashed': power_state.CRASHED} - XenAPI = None |