diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-07 13:59:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-07 13:59:57 +0000 |
| commit | f13eef78a0de494b020bb5d7603d83f389eae615 (patch) | |
| tree | db2e28f2f95889f502be7ff061914a6fbcaee6d9 | |
| parent | 0299ae16817e3b49bd961e73d1ab9e924a800d4f (diff) | |
| parent | 1d0402cf65458c941639f01334a996c11e592018 (diff) | |
| download | nova-f13eef78a0de494b020bb5d7603d83f389eae615.tar.gz nova-f13eef78a0de494b020bb5d7603d83f389eae615.tar.xz nova-f13eef78a0de494b020bb5d7603d83f389eae615.zip | |
Merge "Set read_deleted='yes' for instance_id_mappings."
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 5e38d6e14..dde41a67a 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -5185,7 +5185,10 @@ def get_instance_uuid_by_ec2_id(context, ec2_id, session=None): @require_context def _ec2_instance_get_query(context, session=None): - return model_query(context, models.InstanceIdMapping, session=session) + return model_query(context, + models.InstanceIdMapping, + session=session, + read_deleted='yes') @require_admin_context |