bug #2713: describe_with_terminated_instances conf variable is not used

This commit is contained in:
Daniel Molina committed 2014-02-05 17:45:21 +01:00
1 parent 2308fda135
commit a6c96a6356
2 files changed
+6 -2

No files matched your search

+1 -1
View File
@@ -65,7 +65,7 @@
#:datastore_id:
# Include terminated instances in the describe_instances xml
:describe_with_terminated_instances: = true
:describe_with_terminated_instances: true
# Terminated VMs will be included in the list
# till the termination date + TERMINATED_INSTANCES_EXPIRATION_TIME is reached
:terminated_instances_expiration_time: 900
+5 -1
View File
@@ -340,7 +340,11 @@ module Instance
end
def include_terminated_instances?
@config[:describe_with_terminated_instances] || DESCRIBE_WITH_TERMINATED_INSTANCES
if @config[:describe_with_terminated_instances].nil?
DESCRIBE_WITH_TERMINATED_INSTANCES
else
@config[:describe_with_terminated_instances]
end
end
def include_terminated_instance?(vm)