diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-18 17:02:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-18 17:02:19 +0000 |
| commit | 5bfa8a70e8b11f68deb101c872eace27d7a3b1b4 (patch) | |
| tree | 9c298941f50a7b080518efc53016ec89426496a3 /tools | |
| parent | 60ea96b288d9d8f29d772dce3763fda466c73040 (diff) | |
| parent | 9ff3121bd90133fb3b37c0e10407b5f7ade26b90 (diff) | |
| download | nova-5bfa8a70e8b11f68deb101c872eace27d7a3b1b4.tar.gz nova-5bfa8a70e8b11f68deb101c872eace27d7a3b1b4.tar.xz nova-5bfa8a70e8b11f68deb101c872eace27d7a3b1b4.zip | |
Merge "Replaces functions in utils.py with openstack/common/timeutils.py"
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/xenserver/vm_vdi_cleaner.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/xenserver/vm_vdi_cleaner.py b/tools/xenserver/vm_vdi_cleaner.py index bccf50b25..1d33586da 100755 --- a/tools/xenserver/vm_vdi_cleaner.py +++ b/tools/xenserver/vm_vdi_cleaner.py @@ -25,7 +25,7 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import utils +from nova.openstack.common import timeutils from nova.virt.xenapi import connection as xenapi_conn @@ -90,7 +90,7 @@ def find_orphaned_instances(session, verbose=False): # NOTE(jk0): A zombie VM is an instance that is not active and hasn't # been updated in over the specified period. is_zombie_vm = (instance.vm_state != "active" - and utils.is_older_than(instance.updated_at, + and timeutils.is_older_than(instance.updated_at, FLAGS.zombie_instance_updated_at_window)) if is_active_and_deleting or is_zombie_vm: |