shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

bug #2713: describe_with_terminated_instances conf variable is not used

Browse Source
This commit is contained in:
Daniel Molina 2014-02-05 17:44:55 +01:00
parent 2308fda135
commit a6c96a6356
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cloud/ec2/etc/econe.conf
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

6
src/cloud/ec2/lib/instance.rb
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)