diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-09-08 15:26:44 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-09-08 15:26:44 -0400 |
| commit | 4bf6508a026c62a7aa2423b1910c871ddc3f0916 (patch) | |
| tree | 1e299c55660d314ac82fd567cf31657b708c60aa /nova/api | |
| parent | 6cbbdb909443a33c2af8ddd73b861cd41201fa0b (diff) | |
| download | nova-4bf6508a026c62a7aa2423b1910c871ddc3f0916.tar.gz nova-4bf6508a026c62a7aa2423b1910c871ddc3f0916.tar.xz nova-4bf6508a026c62a7aa2423b1910c871ddc3f0916.zip | |
converting fix to just address ec2; updating test
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 049ca6f93..4f7030a5a 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1200,8 +1200,10 @@ class CloudController(object): instances.append(instance) else: try: + # always filter out deleted instances + search_opts['deleted'] = False instances = self.compute_api.get_all(context, - search_opts=search_opts) + search_opts=search_opts) except exception.NotFound: instances = [] for instance in instances: |