diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-12 20:53:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-12 20:53:15 +0000 |
| commit | ca88bb4c6c09e144ccb1cc0f68e7e7c077035944 (patch) | |
| tree | 816228f6c7a5479a33a828710a432652c1b5bb7f | |
| parent | 0df84e9bba8d5a77680cc65fd5488e9a5298f2cd (diff) | |
| parent | 43bf8344488a6af1046344c255bdb2edd7450475 (diff) | |
| download | nova-ca88bb4c6c09e144ccb1cc0f68e7e7c077035944.tar.gz nova-ca88bb4c6c09e144ccb1cc0f68e7e7c077035944.tar.xz nova-ca88bb4c6c09e144ccb1cc0f68e7e7c077035944.zip | |
Merge "read_deleted snapshot and volume id mappings."
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index dde41a67a..0946d0b19 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -2995,12 +2995,14 @@ def _volume_get_query(context, session=None, project_only=False): @require_context def _ec2_volume_get_query(context, session=None): - return model_query(context, models.VolumeIdMapping, session=session) + return model_query(context, models.VolumeIdMapping, + session=session, read_deleted='yes') @require_context def _ec2_snapshot_get_query(context, session=None): - return model_query(context, models.SnapshotIdMapping, session=session) + return model_query(context, models.SnapshotIdMapping, + session=session, read_deleted='yes') @require_context |