diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2012-07-17 21:51:52 +0000 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2012-07-17 21:58:00 +0000 |
| commit | 216467b3454bca97106463957da88290f8a47fa7 (patch) | |
| tree | 7abe7a02d5dc491a02a9331588a8e98f1cac720e /tools/xenserver | |
| parent | acb158714c562d3142bf2f3f560dc374daa2df7d (diff) | |
| download | nova-216467b3454bca97106463957da88290f8a47fa7.tar.gz nova-216467b3454bca97106463957da88290f8a47fa7.tar.xz nova-216467b3454bca97106463957da88290f8a47fa7.zip | |
Fixes XenAPI driver import in vm_vdi_cleaner
xenapi/connection.py was renamed xenapi/driver.py, it appears, but
vm_vdi_cleaner was not updated.
Also removed unused optparse import.
Fixes bug 1025912
Change-Id: Ia1a93400dc24455fe91fdf4283eb32bcca4037cf
Diffstat (limited to 'tools/xenserver')
| -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: |