Merge "Add Octavia anti-affinity parameters" into stable/rocky

This commit is contained in:
Zuul 2019-12-20 22:15:12 +00:00 committed by Gerrit Code Review
commit dfc2dfc5fb
2 changed files with 9 additions and 0 deletions

View File

@ -67,6 +67,10 @@ parameters:
default: 300 default: 300
description: Seconds to wait for a port to detach from an amphora. description: Seconds to wait for a port to detach from an amphora.
type: number type: number
OctaviaAntiAffinity:
default: true
description: Flag to indicate if anti-affinity feature is turned on.
type: boolean
conditions: conditions:
octavia_topology_unset: {equals : [{get_param: OctaviaLoadBalancerTopology}, ""]} octavia_topology_unset: {equals : [{get_param: OctaviaLoadBalancerTopology}, ""]}
@ -100,6 +104,7 @@ outputs:
octavia::controller::connection_logging: {get_param: OctaviaConnectionLogging} octavia::controller::connection_logging: {get_param: OctaviaConnectionLogging}
octavia::controller::build_active_retries: {get_param: OctaviaBuildActiveRetries} octavia::controller::build_active_retries: {get_param: OctaviaBuildActiveRetries}
octavia::controller::port_detach_timeout: {get_param: OctaviaPortDetachTimeout} octavia::controller::port_detach_timeout: {get_param: OctaviaPortDetachTimeout}
octavia::controller::enable_anti_affinity: {get_param: OctaviaAntiAffinity}
- -
if: if:
- octavia_topology_unset - octavia_topology_unset

View File

@ -0,0 +1,4 @@
---
features:
- |
Added the Octavia anti-affinity parameters.