summaryrefslogtreecommitdiffstats
path: root/tools/xenserver
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-10-15 02:03:34 +0100
committerMark McLoughlin <markmc@redhat.com>2012-11-04 21:38:38 +0000
commit8ce58defbe560b1da34d991b38ac64a9b4c8d654 (patch)
tree57d794afbc9fdb8e63c37198c9d2a6dff402cbf6 /tools/xenserver
parentefede80046e0504dc8a68ab5447f97b05c02dd7a (diff)
downloadnova-8ce58defbe560b1da34d991b38ac64a9b4c8d654.tar.gz
nova-8ce58defbe560b1da34d991b38ac64a9b4c8d654.tar.xz
nova-8ce58defbe560b1da34d991b38ac64a9b4c8d654.zip
Remove flags.DECLARE
The cfg.ConfigOpts class has an equivalent method, so lets use that. Change-Id: I5860230336d00d7531a0ffd255c766ff77661625
Diffstat (limited to 'tools/xenserver')
-rwxr-xr-xtools/xenserver/vm_vdi_cleaner.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/xenserver/vm_vdi_cleaner.py b/tools/xenserver/vm_vdi_cleaner.py
index f04adc74e..10f9c1ffe 100755
--- a/tools/xenserver/vm_vdi_cleaner.py
+++ b/tools/xenserver/vm_vdi_cleaner.py
@@ -27,17 +27,17 @@ 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 context
from nova import db
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 driver as xenapi_driver
-CONF = cfg.CONF
-flags.DECLARE("resize_confirm_window", "nova.compute.manager")
+CONF = config.CONF
+CONF.import_opt("resize_confirm_window", "nova.compute.manager")
ALLOWED_COMMANDS = ["list-vdis", "clean-vdis", "list-instances",