openstack/nova
Code Issues Proposed changes

Merge "Correctly init XenAPIDriver in vm_vdi_cleaner.py"

Browse Source
This commit is contained in:
Jenkins 2012-12-11 00:51:57 +00:00 committed by Gerrit Code Review
commit fcedc02a6f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/xenserver/vm_vdi_cleaner.py
View File

@ -32,6 +32,7 @@ from nova import db
from nova import exception from nova import exception
from nova.openstack.common import cfg from nova.openstack.common import cfg
from nova.openstack.common import timeutils from nova.openstack.common import timeutils
from nova.virt import virtapi
from nova.virt.xenapi import driver as xenapi_driver from nova.virt.xenapi import driver as xenapi_driver
@ -285,7 +286,9 @@ def main():
raise Exception("`zombie_instance_updated_at_window` has to be longer" raise Exception("`zombie_instance_updated_at_window` has to be longer"
" than `resize_confirm_window`.") " than `resize_confirm_window`.")
xenapi = xenapi_driver.XenAPIDriver() # NOTE(blamar) This tool does not require DB access, so passing in the
# 'abstract' VirtAPI class is acceptable
xenapi = xenapi_driver.XenAPIDriver(virtapi.VirtAPI())
if command == "list-vdis": if command == "list-vdis":
if CONF.verbose: if CONF.verbose: