summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2011-10-12 11:17:49 -0400
committerDan Prince <dan.prince@rackspace.com>2011-10-12 12:35:42 -0400
commit7a2be6264d70faf7f97d12a3f8a252335268359f (patch)
tree899844f5c046b3345f0695a1d25fa55bf7900331 /nova/compute
parente47ddfd23efb9bd6c5b67b183df348252d4e8d04 (diff)
Update EC2 get_metadata calls to search 'deleted': False. Fixes nova smoke_tests!!!
Change-Id: Ibbca93dda82013a5df51ff77b0df806fbb612af6
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/api.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 1aafcdad0..655407b08 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -929,6 +929,9 @@ class API(base.Base):
If there is no filter and the context is an admin, it will retreive
all instances in the system.
+
+ Deleted instances will be returned by default, unless there is a
+ search option that says otherwise.
"""
if search_opts is None: