openstack
/
octavia
Code Issues Proposed changes

Fix stable/queens for bad backport. 

There was a bad backport to stable/queens that depended on another patch
that was not backported. This means the failover flow would fail due
to a missing parameter.  This patch fixes the backported patch to not
depened on that patch that was not backported.

Change-Id: Ia25ab09c8ba373cfe88f7044c7bd2927fe362e8f
This commit is contained in:
Michael Johnson 2018-08-21 08:53:07 -07:00
parent 69beadc7a8
commit d281a2a35b
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