openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Fix Octavia to use correct Puppet class 

Addition of octavia::controller::enable_anti_affinity was reverted in
[1] as code to handle that config option already exists in octavia::nova
class. This patch follows that revert and sets THT to use octavia::nova.

[1] https://review.opendev.org/#/c/699067/

Depends-On: https://review.opendev.org/#/c/699074/
Change-Id: I2204b72e40a86892f7312b9af77754d9c11a6c63
This commit is contained in:
Carlos Goncalves 2019-12-17 10:04:03 +01:00
parent d4974f2185
commit e47e7db8a2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/octavia/octavia-base.yaml
View File

@ -271,7 +271,7 @@ outputs:
octavia::controller::user_log_facility: {get_param: OctaviaTenantLogFacility}
octavia::controller::user_log_format: {get_param: OctaviaUserLogFormat}
octavia::controller::disable_local_log_storage: {get_param: OctaviaDisableLocalLogStorage}
octavia::controller::enable_anti_affinity: {get_param: OctaviaAntiAffinity}
octavia::nova::enable_anti_affinity: {get_param: OctaviaAntiAffinity}
-
if:
- octavia_topology_unset