openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2019-12-13 09:22:48 +00:00 committed by Gerrit Code Review
parent 4b7c7a0455 0c7b4629e2
commit be1478581d
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,6 +165,10 @@ parameters:
default: 300
description: Seconds to wait for a port to detach from an amphora.
type: number
OctaviaAntiAffinity:
default: true
description: Flag to indicate if anti-affinity feature is turned on.
type: boolean
parameter_groups:
- label: deprecated
@ -234,6 +238,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}
-
if:
- octavia_topology_unset

4
releasenotes/notes/add-octavia-anti-affinity-parameters-fe9222f17b16ee1f.yaml Normal file
View File

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