From 060b274a136121ccda75f2b6efadde6d6a730fa5 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Mon, 7 Oct 2013 19:02:43 -0400 Subject: [PATCH] Update default for running_deleted_instance_action Update the default value of running_deleted_instance_action to 'reap' from 'log'. Consensus seems to be that this is what most people expect. DocImpact http://lists.openstack.org/pipermail/openstack-dev/2013-October/016153.html Change-Id: I24990e20c8b85fb8b7ce15c229f99f5b0281f103 --- etc/nova/nova.conf.sample | 2 +- nova/compute/manager.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample index b0185df117ff..599c4de7bc4b 100644 --- a/etc/nova/nova.conf.sample +++ b/etc/nova/nova.conf.sample @@ -730,7 +730,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) diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 56bfa869431c..7f5d77593000 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -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."),