diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-07 05:41:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-07 05:41:57 +0000 |
| commit | ee3d2a190844b7b0493545c6e6967cfdf520a67d (patch) | |
| tree | 5ada6a336288e02f6d70495128cad7434e943976 /tools | |
| parent | d4dd0842b63ff3bbe0f51f3e222c0d852df79f9c (diff) | |
| parent | 637e805634b5179ffacad57ee26d4175449537f5 (diff) | |
| download | nova-ee3d2a190844b7b0493545c6e6967cfdf520a67d.tar.gz nova-ee3d2a190844b7b0493545c6e6967cfdf520a67d.tar.xz nova-ee3d2a190844b7b0493545c6e6967cfdf520a67d.zip | |
Merge "Switch from FLAGS to CONF in misc modules"
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/xenserver/destroy_cached_images.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/xenserver/destroy_cached_images.py b/tools/xenserver/destroy_cached_images.py index a9045cd61..01d68b4f6 100644 --- a/tools/xenserver/destroy_cached_images.py +++ b/tools/xenserver/destroy_cached_images.py @@ -33,7 +33,6 @@ from nova import utils from nova.virt.xenapi import driver as xenapi_driver from nova.virt.xenapi import vm_utils -FLAGS = flags.FLAGS destroy_opts = [ cfg.BoolOpt('all_cached', default=False, @@ -44,7 +43,8 @@ destroy_opts = [ help='Don\'t actually delete the VDIs.') ] -FLAGS.register_cli_opts(destroy_opts) +CONF = config.CONF +CONF.register_cli_opts(destroy_opts) def main(): @@ -56,8 +56,8 @@ def main(): sr_ref = vm_utils.safe_find_sr(session) destroyed = vm_utils.destroy_cached_images( - session, sr_ref, all_cached=FLAGS.all_cached, - dry_run=FLAGS.dry_run) + session, sr_ref, all_cached=CONF.all_cached, + dry_run=CONF.dry_run) if '--verbose' in sys.argv: print '\n'.join(destroyed) |