summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/conf/extract_opts.py4
-rwxr-xr-xtools/xenserver/vm_vdi_cleaner.py1
2 files changed, 1 insertions, 4 deletions
diff --git a/tools/conf/extract_opts.py b/tools/conf/extract_opts.py
index 3185cb93d..884dcdea6 100644
--- a/tools/conf/extract_opts.py
+++ b/tools/conf/extract_opts.py
@@ -63,10 +63,6 @@ def main(srcfiles):
# The options list is a list of (module, options) tuples
opts_by_group = {'DEFAULT': []}
- opts_by_group['DEFAULT'].append(
- (cfg.__name__ + ':' + cfg.CommonConfigOpts.__name__,
- _list_opts(cfg.CommonConfigOpts)[0][1]))
-
for pkg_name in pkg_names:
mods = mods_by_pkg.get(pkg_name)
mods.sort()
diff --git a/tools/xenserver/vm_vdi_cleaner.py b/tools/xenserver/vm_vdi_cleaner.py
index eeaf978b8..27b89d510 100755
--- a/tools/xenserver/vm_vdi_cleaner.py
+++ b/tools/xenserver/vm_vdi_cleaner.py
@@ -42,6 +42,7 @@ cleaner_opts = [
]
CONF = cfg.CONF
CONF.register_opts(cleaner_opts)
+CONF.import_opt('verbose', 'nova.openstack.common.log')
CONF.import_opt("resize_confirm_window", "nova.compute.manager")