openstack
/
nova
Code Issues Proposed changes

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
This commit is contained in:
Chris Behrens 2012-07-17 21:51:52 +00:00
parent acb158714c
commit 216467b345
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/xenserver/vm_vdi_cleaner.py
View File

@ -17,7 +17,6 @@
"""vm_vdi_cleaner.py - List or clean orphaned VDIs/instances on XenServer.""" """vm_vdi_cleaner.py - List or clean orphaned VDIs/instances on XenServer."""
import doctest import doctest
import optparse
import os import os
import sys import sys
import XenAPI import XenAPI
@ -34,7 +33,7 @@ from nova import exception
from nova import flags from nova import flags
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.xenapi import connection as xenapi_conn from nova.virt.xenapi import driver as xenapi_driver
CONF = cfg.CONF CONF = cfg.CONF
@ -286,7 +285,7 @@ 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_conn.XenAPIDriver() xenapi = xenapi_driver.XenAPIDriver()
if command == "list-vdis": if command == "list-vdis":
if CONF.verbose: if CONF.verbose: