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
(cherry picked from commit e47e7db8a2)
(cherry picked from commit 8184b94972)
(cherry picked from commit 361a47d2a7)
(cherry picked from commit 5004058b6a)
This commit is contained in:
Carlos Goncalves 2019-12-17 10:04:03 +01:00
parent c4f3c5ace8
commit 6be12fba39
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/services/octavia-controller.yaml
View File

@ -105,7 +105,7 @@ outputs:
octavia::controller::connection_logging: {get_param: OctaviaConnectionLogging}
octavia::controller::build_active_retries: {get_param: OctaviaBuildActiveRetries}
octavia::controller::port_detach_timeout: {get_param: OctaviaPortDetachTimeout}
octavia::controller::enable_anti_affinity: {get_param: OctaviaAntiAffinity}
octavia::nova::enable_anti_affinity: {get_param: OctaviaAntiAffinity}
-
if:
- octavia_topology_unset