diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-12 18:14:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-12 18:14:27 +0000 |
| commit | 411ee404f50462facafbfb38beaed61147a60e0d (patch) | |
| tree | 76da87639f9655e7b145885b1427f207183ef88d | |
| parent | 0a1509b4fd624e044f8af1657115234ca9b59c66 (diff) | |
| parent | 0ea8a37db8c369c245584702d90daf3c94bf6f79 (diff) | |
| download | nova-411ee404f50462facafbfb38beaed61147a60e0d.tar.gz nova-411ee404f50462facafbfb38beaed61147a60e0d.tar.xz nova-411ee404f50462facafbfb38beaed61147a60e0d.zip | |
Merge "Make instance_system_metadata load with instance"
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 74d1c77f5..10514e6b3 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1462,7 +1462,8 @@ def _build_instance_get(context, session=None): options(joinedload_all('security_groups.rules')).\ options(joinedload('info_cache')).\ options(joinedload('metadata')).\ - options(joinedload('instance_type')) + options(joinedload('instance_type')).\ + options(joinedload('system_metadata')) @require_context @@ -1495,6 +1496,7 @@ def instance_get_all_by_filters(context, filters, sort_key, sort_dir, query_prefix = session.query(models.Instance).\ options(joinedload('info_cache')).\ options(joinedload('security_groups')).\ + options(joinedload('system_metadata')).\ options(joinedload('metadata')).\ options(joinedload('instance_type')).\ order_by(sort_fn[sort_dir](getattr(models.Instance, sort_key))) |