openstack/nova
Code Issues Proposed changes

Merge "Update default for running_deleted_instance_action"

Browse Source
This commit is contained in:
Jenkins
2013-10-08 22:12:27 +00:00
committed by Gerrit Code Review
parent abea01b65d 060b274a13
commit 6976638be6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/nova/nova.conf.sample
View File

@@ -732,7 +732,7 @@
# Action to take if a running deleted instance is
# detected.Valid options are 'noop', 'log' and 'reap'. Set to
# 'noop' to disable. (string value)
#running_deleted_instance_action=log
#running_deleted_instance_action=reap
# Number of seconds to wait between runs of the cleanup task.
# (integer value)

2
nova/compute/manager.py
View File

@@ -178,7 +178,7 @@ timeout_opts = [
running_deleted_opts = [
cfg.StrOpt("running_deleted_instance_action",
default="log",
default="reap",
help="Action to take if a running deleted instance is detected."
"Valid options are 'noop', 'log' and 'reap'. "
"Set to 'noop' to disable."),