From 8d5891e5bc3eab55f4ce8e47ce2bf8d73c96f742 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Mon, 21 Jan 2013 16:08:37 +0000 Subject: Sync latest cfg from oslo-incubator The main change is: c5984ba Move logging config options into the log module Re-generate nova.conf.sample to reflect the options move. Change-Id: I3913ea54465658d93dc56e014dfe5d911b0541d6 --- tools/conf/extract_opts.py | 4 ---- tools/xenserver/vm_vdi_cleaner.py | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'tools') 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") -- cgit