openstack
/
octavia
Code Issues Proposed changes

Merge "Fix stable/queens for bad backport." into stable/queens

This commit is contained in:
Zuul 2018-08-22 00:41:33 +00:00 committed by Gerrit Code Review
parent c3fb057600 d281a2a35b
commit 880a309ab3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
octavia/controller/worker/tasks/database_tasks.py
View File

@ -1536,9 +1536,9 @@ class GetAmphoraeFromLoadbalancer(BaseDatabaseTask):
"""
amphorae = []
for amp in loadbalancer.amphorae:
a = self.amphora_repo.get(db_apis.get_session(), id=amp.id,
show_deleted=False)
if a is None:
a = self.amphora_repo.get(db_apis.get_session(), id=amp.id)
if a is None or a.status == constants.DELETED:
continue
amphorae.append(a)
return amphorae