diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-24 21:11:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-24 21:11:27 +0000 |
| commit | 625d593431885bc98d6f7297890601d0923db76b (patch) | |
| tree | 01f4a6945f1dbee74f8e3804f3427dabab821516 /nova/api | |
| parent | 5fa2774e2715ad29dbf3c9342484cdc12560b2d0 (diff) | |
| parent | a9c695d82111702c562f4bb36fb9ea964b9d0913 (diff) | |
| download | nova-625d593431885bc98d6f7297890601d0923db76b.tar.gz nova-625d593431885bc98d6f7297890601d0923db76b.tar.xz nova-625d593431885bc98d6f7297890601d0923db76b.zip | |
Merge "Fix orphaned instance from get_by_uuid() and _from_db_object()"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index e02f7b6f9..51a86e02f 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -211,9 +211,8 @@ def db_to_inst_obj(context, db_instance): # NOTE(danms): This is a temporary helper method for converting # Instance DB objects to NovaObjects without needing to re-query. inst_obj = instance_obj.Instance._from_db_object( - instance_obj.Instance(), db_instance, + context, instance_obj.Instance(), db_instance, expected_attrs=['system_metadata', 'metadata']) - inst_obj._context = context return inst_obj |