diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-11 00:23:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-11 00:23:34 +0000 |
| commit | 58a6d062bd9eb90a7d52aebeeb0e8cec03f63651 (patch) | |
| tree | d2f946ec4ea29e9ef76e71d34a7b60c6c4ab3c7b | |
| parent | 8dca589640ee203944a56fcde943462a1156ff5c (diff) | |
| parent | 2ef0dcfac78468551aac8492269ad856c312dcb5 (diff) | |
| download | nova-58a6d062bd9eb90a7d52aebeeb0e8cec03f63651.tar.gz nova-58a6d062bd9eb90a7d52aebeeb0e8cec03f63651.tar.xz nova-58a6d062bd9eb90a7d52aebeeb0e8cec03f63651.zip | |
Merge "Avoid lazy-loading errors on instance_type"
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index e6d7f88c7..93bce01c5 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -3538,9 +3538,9 @@ def security_group_rule_get(context, security_group_rule_id, session=None): 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')).\ - all() + filter_by(parent_group_id=security_group_id).\ + options(joinedload_all('grantee_group.instances.instance_type')).\ + all() @require_context |