diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-18 14:29:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-18 14:29:36 +0000 |
| commit | 1fa4b5b5050decc2cd431fb7c872dbfeefd44bbf (patch) | |
| tree | 18270e3fb4f649915d34fcbe0baea205ba188d10 | |
| parent | f1bca04333684c0b462042d902f49aa92587b9f1 (diff) | |
| parent | 216467b3454bca97106463957da88290f8a47fa7 (diff) | |
| download | nova-1fa4b5b5050decc2cd431fb7c872dbfeefd44bbf.tar.gz nova-1fa4b5b5050decc2cd431fb7c872dbfeefd44bbf.tar.xz nova-1fa4b5b5050decc2cd431fb7c872dbfeefd44bbf.zip | |
Merge "Fixes XenAPI driver import in vm_vdi_cleaner"
| -rwxr-xr-x | tools/xenserver/vm_vdi_cleaner.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/xenserver/vm_vdi_cleaner.py b/tools/xenserver/vm_vdi_cleaner.py index b0e9d981c..f04adc74e 100755 --- a/tools/xenserver/vm_vdi_cleaner.py +++ b/tools/xenserver/vm_vdi_cleaner.py @@ -17,7 +17,6 @@ """vm_vdi_cleaner.py - List or clean orphaned VDIs/instances on XenServer.""" import doctest -import optparse import os import sys import XenAPI @@ -34,7 +33,7 @@ from nova import exception from nova import flags from nova.openstack.common import cfg from nova.openstack.common import timeutils -from nova.virt.xenapi import connection as xenapi_conn +from nova.virt.xenapi import driver as xenapi_driver CONF = cfg.CONF @@ -286,7 +285,7 @@ def main(): raise Exception("`zombie_instance_updated_at_window` has to be longer" " than `resize_confirm_window`.") - xenapi = xenapi_conn.XenAPIDriver() + xenapi = xenapi_driver.XenAPIDriver() if command == "list-vdis": if CONF.verbose: |