diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-12 19:38:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-12 19:38:40 +0000 |
| commit | 9b9656ea00968d7798695ce715e5f81b35fa18c4 (patch) | |
| tree | cc2db566450470c7e1f2f9ba4d18c1c675a2c385 | |
| parent | 43b95ca29ec5ad318c771d03d151a9425e138cec (diff) | |
| parent | 23c576a396ae963262a99f8fdf7c7d422ddb8bd2 (diff) | |
| download | nova-9b9656ea00968d7798695ce715e5f81b35fa18c4.tar.gz nova-9b9656ea00968d7798695ce715e5f81b35fa18c4.tar.xz nova-9b9656ea00968d7798695ce715e5f81b35fa18c4.zip | |
Merge "Change default of running_deleted_instance_action"
| -rw-r--r-- | etc/nova/nova.conf.sample | 2 | ||||
| -rw-r--r-- | 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 ba99c4287..54caf29ed 100644 --- a/etc/nova/nova.conf.sample +++ b/etc/nova/nova.conf.sample @@ -642,7 +642,7 @@ ###### (IntOpt) Automatically confirm resizes after N seconds. Set to 0 to disable. # resize_confirm_window=0 ###### (StrOpt) Action to take if a running deleted instance is detected.Valid options are 'noop', 'log' and 'reap'. Set to 'noop' to disable. -# running_deleted_instance_action="noop" +# running_deleted_instance_action="log" ###### (IntOpt) Number of periodic scheduler ticks to wait between runs of the cleanup task. # running_deleted_instance_poll_interval=30 ###### (IntOpt) Number of seconds after being deleted when a running instance should be considered eligible for cleanup. diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 889e9e5f0..17e6fa5b1 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -107,7 +107,7 @@ compute_opts = [ help="Number of periodic scheduler ticks to wait between " "runs of the cleanup task."), cfg.StrOpt("running_deleted_instance_action", - default="noop", + default="log", help="Action to take if a running deleted instance is detected." "Valid options are 'noop', 'log' and 'reap'. " "Set to 'noop' to disable."), |