openstack/placement
Code Issues Proposed changes

Merge "Fix update inventory for multiple providers"

Browse Source
This commit is contained in:
Jenkins 2016-06-10 05:07:20 +00:00 committed by Gerrit Code Review
commit d9e8220b00
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/db/sqlalchemy/api_models.py
View File

@ -308,8 +308,8 @@ class Inventory(API_BASE):
allocation_ratio = Column(Float, nullable=False) allocation_ratio = Column(Float, nullable=False)
resource_provider = orm.relationship( resource_provider = orm.relationship(
"ResourceProvider", "ResourceProvider",
primaryjoin=('and_(Inventory.resource_provider_id == ' primaryjoin=('Inventory.resource_provider_id == '
'ResourceProvider.id)'), 'ResourceProvider.id'),
foreign_keys=resource_provider_id) foreign_keys=resource_provider_id)