diff options
author | Anusha Unnam <anusha.unnam@intel.com> | 2016-03-29 22:23:09 +0000 |
---|---|---|
committer | Anusha Unnam <anusha.unnam@intel.com> | 2016-04-05 16:34:02 +0000 |
commit | 424ab495e7ae103112def398b122b7cc528fb0a6 (patch) | |
tree | 147ffeee12400218c9857214536d1c4cfd3d0cab /tools | |
parent | 8caaf3572eacf2db65bd37e9cac99ef153a071a9 (diff) | |
download | nova-424ab495e7ae103112def398b122b7cc528fb0a6.tar.gz |
Config options: Centralize xenapi driver options
The config options of
"nova/virt/xenapi/driver.py" got moved
to the new central location
"nova/conf/xenserver.py”
Change-Id: I87f6163c7a3b69ef8ede947132b771f32742781e
Implements: blueprint centralize-config-options-newton
Diffstat (limited to 'tools')
-rw-r--r-- | tools/xenserver/destroy_cached_images.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tools/xenserver/destroy_cached_images.py b/tools/xenserver/destroy_cached_images.py index 4b7df35792..8e32d64630 100644 --- a/tools/xenserver/destroy_cached_images.py +++ b/tools/xenserver/destroy_cached_images.py @@ -27,6 +27,7 @@ POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')): sys.path.insert(0, POSSIBLE_TOPDIR) +import nova.conf from nova import config from nova import utils from nova.virt.xenapi.client import session @@ -42,17 +43,9 @@ destroy_opts = [ help='Don\'t actually delete the VDIs.') ] -CONF = cfg.CONF +CONF = nova.conf.CONF CONF.register_cli_opts(destroy_opts) -CONF.import_opt('connection_url', 'nova.virt.xenapi.driver', - group='xenserver') -CONF.import_opt('connection_username', 'nova.virt.xenapi.driver', - group='xenserver') -CONF.import_opt('connection_password', 'nova.virt.xenapi.driver', - group='xenserver') - - def main(): config.parse_args(sys.argv) utils.monkey_patch() |