diff options
| author | Sujitha <sujitha.neti@intel.com> | 2016-03-21 22:39:29 +0000 |
|---|---|---|
| committer | Sujitha <sujitha.neti@intel.com> | 2016-04-20 19:00:25 +0000 |
| commit | 8fc7d30600a8460362c61887c975cb8987f84576 (patch) | |
| tree | 171fa3348c90203f50202b36dfa486739b385840 /tools | |
| parent | 5538efa1fb2bb446b9937b2c92793f6b5d448402 (diff) | |
| download | nova-8fc7d30600a8460362c61887c975cb8987f84576.tar.gz | |
Config options: Centralize compute options
This change moves the config options in nova/compute/
manager.py to a central location "nova/conf/compute.py".
Change-Id: Iac75f966571d1224fcd9487b110cb5a4eaa29219
Implements: blueprint centralize-config-options-newton
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 10ca0da8d2..ef5787aa6f 100755 --- a/tools/xenserver/vm_vdi_cleaner.py +++ b/tools/xenserver/vm_vdi_cleaner.py @@ -29,6 +29,7 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")): from nova import config from nova import context +import nova.conf from nova import db from nova import exception from oslo_utils import timeutils @@ -45,11 +46,10 @@ cleaner_opts = [ cli_opt = cfg.StrOpt('command', help='Cleaner command') -CONF = cfg.CONF +CONF = nova.conf.CONF CONF.register_opts(cleaner_opts) CONF.register_cli_opt(cli_opt) CONF.import_opt('verbose', 'nova.openstack.common.log') -CONF.import_opt("resize_confirm_window", "nova.compute.manager") ALLOWED_COMMANDS = ["list-vdis", "clean-vdis", "list-instances", |