summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-12-11 08:06:07 +0000
committerMark McLoughlin <markmc@redhat.com>2012-12-11 08:06:53 +0000
commit79ac64dd3295544d0a3fd3ad061284509528ba63 (patch)
tree530ca663eed43c5a18aff681140602d32cf7439b /tools
parent473ef9e80d2c29e2d6f3fecca07f3720a0fe2ba4 (diff)
downloadnova-79ac64dd3295544d0a3fd3ad061284509528ba63.tar.gz
nova-79ac64dd3295544d0a3fd3ad061284509528ba63.tar.xz
nova-79ac64dd3295544d0a3fd3ad061284509528ba63.zip
Move zombie_instance_updated_at_window option
The zombie_instance_updated_at_window option is only used in vm_vdi_cleaner so declare it there. blueprint: scope-config-opts Change-Id: I8d95fbd858f8afe855c2b559dea6995497d8f682
Diffstat (limited to 'tools')
-rwxr-xr-xtools/xenserver/vm_vdi_cleaner.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/xenserver/vm_vdi_cleaner.py b/tools/xenserver/vm_vdi_cleaner.py
index 06c7a2173..fb06a9c32 100755
--- a/tools/xenserver/vm_vdi_cleaner.py
+++ b/tools/xenserver/vm_vdi_cleaner.py
@@ -35,9 +35,13 @@ from nova.openstack.common import timeutils
from nova.virt import virtapi
from nova.virt.xenapi import driver as xenapi_driver
-
+cleaner_opts = [
+ cfg.IntOpt('zombie_instance_updated_at_window',
+ default=172800,
+ help='Number of seconds zombie instances are cleaned up.'),
+]
CONF = cfg.CONF
-CONF.import_opt('zombie_instance_updated_at_window', 'nova.config')
+CONF.register_opts(cleaner_opts)
CONF.import_opt("resize_confirm_window", "nova.compute.manager")