diff options
| author | Josh Kearney <josh@jk0.org> | 2011-09-27 15:21:42 -0500 |
|---|---|---|
| committer | Josh Kearney <josh@jk0.org> | 2011-09-30 12:45:15 -0500 |
| commit | 04548b067c7c79602332fe2bc2dc89ed77cee7ac (patch) | |
| tree | a51b60a128da066d4708fab6fe464941cf88bd55 /nova | |
| parent | f40d94e59f000a2937cea68663053739e721b80e (diff) | |
| download | nova-04548b067c7c79602332fe2bc2dc89ed77cee7ac.tar.gz nova-04548b067c7c79602332fe2bc2dc89ed77cee7ac.tar.xz nova-04548b067c7c79602332fe2bc2dc89ed77cee7ac.zip | |
Adds a script that can automatically delete orphaned VDIs. Also had to move some flags around to avoid circular imports.
Fixes bug 809614.
Change-Id: I635f7eef9ede45bee1ee4a62a3882b55d4222ee3
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/compute/api.py | 1 | ||||
| -rw-r--r-- | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/flags.py | 7 |
3 files changed, 7 insertions, 3 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 7bf28d24e..8b0c76cb1 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -47,7 +47,6 @@ LOG = logging.getLogger('nova.compute.api') FLAGS = flags.FLAGS flags.DECLARE('vncproxy_topic', 'nova.vnc') -flags.DECLARE('reclaim_instance_interval', 'nova.compute.manager') flags.DEFINE_integer('find_host_timeout', 30, 'Timeout after NN seconds when looking for a host.') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 9c6358a34..169439ffd 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -83,8 +83,6 @@ flags.DEFINE_integer("resize_confirm_window", 0, " Set to 0 to disable.") flags.DEFINE_integer('host_state_interval', 120, 'Interval in seconds for querying the host status') -flags.DEFINE_integer('reclaim_instance_interval', 0, - 'Interval in seconds for reclaiming deleted instances') LOG = logging.getLogger('nova.compute.manager') diff --git a/nova/flags.py b/nova/flags.py index 1050f0347..58e8570b1 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -435,3 +435,10 @@ DEFINE_bool('allow_resize_to_same_host', False, DEFINE_string('stub_network', False, 'Stub network related code') + +DEFINE_integer('reclaim_instance_interval', 0, + 'Interval in seconds for reclaiming deleted instances') + +DEFINE_integer('zombie_instance_updated_at_window', 172800, + 'Limit in seconds that a zombie instance can exist before ' + 'being cleaned up.') |