openstack
/
octavia
Code Issues Proposed changes

Merge "Fix spare amphora failover"

This commit is contained in:
Zuul 2019-04-26 04:29:38 +00:00 committed by Gerrit Code Review
parent 6367e04de5 a509710a7f
commit 6fb974c92b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octavia/controller/worker/controller_worker.py
View File

@ -823,7 +823,7 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine):
db_apis.get_session(), amp.id)
if CONF.nova.enable_anti_affinity and lb:
stored_params[constants.SERVER_GROUP_ID] = lb.server_group_id
if lb.flavor_id:
if lb and lb.flavor_id:
stored_params[constants.FLAVOR] = (
self._flavor_repo.get_flavor_metadata_dict(
db_apis.get_session(), lb.flavor_id))

4
releasenotes/notes/fixed-spare-amphora-rotation-007ba406411a313d.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- |
Fixed a bug that prevents spare amphora rotation.