diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2013-02-11 09:00:16 -0800 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2013-02-20 08:12:57 -0800 |
| commit | 1564bbce9816eaeeffb6007564cf5b1aaa7561a1 (patch) | |
| tree | 2262a2c05f3ed0559574eb5efafcd43663aa21a1 /nova/db | |
| parent | 032308c7920b368541f1f89bfab550e1e9e48f31 (diff) | |
Fix handling of source_groups with no-db-compute.
The moving of data around in no-db-compute broke source groups. This
is a combination of a few errors. First, the instance_type data wasn't
being retrieved from system_metadata. Second, the instance_type data
was too deep in the heirarchy and being ignored. Finally, source
groups require a nw info call which causes a db access by
nova-compute.
Fixes bug 1122316
Change-Id: Iccb6e5d336c0b2c8ba41c41ab2e046fc9617835a
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 2ac08f6eb..c717871d1 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -3203,7 +3203,8 @@ def security_group_rule_get_by_security_group(context, security_group_id, session=None): return _security_group_rule_get_query(context, session=session).\ filter_by(parent_group_id=security_group_id).\ - options(joinedload_all('grantee_group.instances.instance_type')).\ + options(joinedload_all('grantee_group.instances.' + 'system_metadata')).\ all() |