From 5004058b6a27106423f3a2fa09c08600fb256887 Mon Sep 17 00:00:00 2001 From: Carlos Goncalves Date: Tue, 17 Dec 2019 10:04:03 +0100 Subject: [PATCH] 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 e47e7db8a2ee3e59a7c6b71620ba540078f4f123) (cherry picked from commit 8184b949720ff804635baa437649cc6e7067b83b) (cherry picked from commit 361a47d2a75eb7d10cd87163d3ae7b4f79314f31) --- puppet/services/octavia-controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puppet/services/octavia-controller.yaml b/puppet/services/octavia-controller.yaml index f6160385f3..1451f38bde 100644 --- a/puppet/services/octavia-controller.yaml +++ b/puppet/services/octavia-controller.yaml @@ -104,7 +104,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