diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-19 14:07:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-19 14:07:11 +0000 |
| commit | c1d7dd7af8b13b9f9baf589f2e58ba2f8afef75b (patch) | |
| tree | 73097b09ae82d125fc2535ea7974ea4d7fa7b838 /tools | |
| parent | c2c99310d9c741be0e218638819dc5254fae145e (diff) | |
| parent | 6e92a67fc3e6dcd587e3fd225b7142bc74116e52 (diff) | |
| download | nova-c1d7dd7af8b13b9f9baf589f2e58ba2f8afef75b.tar.gz nova-c1d7dd7af8b13b9f9baf589f2e58ba2f8afef75b.tar.xz nova-c1d7dd7af8b13b9f9baf589f2e58ba2f8afef75b.zip | |
Merge "Remove nova.flags"
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/xenserver/destroy_cached_images.py | 2 | ||||
| -rwxr-xr-x | tools/xenserver/vm_vdi_cleaner.py | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/xenserver/destroy_cached_images.py b/tools/xenserver/destroy_cached_images.py index 01d68b4f6..88f24f4ef 100644 --- a/tools/xenserver/destroy_cached_images.py +++ b/tools/xenserver/destroy_cached_images.py @@ -26,7 +26,7 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')): sys.path.insert(0, POSSIBLE_TOPDIR) from nova import config -from nova import flags +from nova import config from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova import utils diff --git a/tools/xenserver/vm_vdi_cleaner.py b/tools/xenserver/vm_vdi_cleaner.py index 10f9c1ffe..89fc454b1 100755 --- a/tools/xenserver/vm_vdi_cleaner.py +++ b/tools/xenserver/vm_vdi_cleaner.py @@ -31,7 +31,6 @@ from nova import config from nova import context from nova import db from nova import exception -from nova import flags from nova.openstack.common import timeutils from nova.virt.xenapi import driver as xenapi_driver |