From 0486e56a79c786521dec83b598149adfe44c3310 Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Mon, 18 Nov 2019 11:09:52 -0800
Subject: [PATCH] Add Octavia anti-affinity parameters

This patch adds the following parameter for Octavia:

1. OctaviaAntiAffinity

The default value is 'true' as is a best practice for production
deployments.

Depends-On: https://review.opendev.org/696965/
Change-Id: I1adb886405cde6b6e0b5f25a735e36114cd1787b
(cherry picked from commit 7f8a565ea88b1058543fdbb2d1fb76d04c9cfebd)
(cherry picked from commit ef66a0f4f56b4e7ccb916ef7e69f4cc24315a945)
(cherry picked from commit 0c7b4629e2b6ad02be0b5a07a178206784bf5836)
---
 puppet/services/octavia-controller.yaml                      | 5 +++++
 ...dd-octavia-anti-affinity-parameters-fe9222f17b16ee1f.yaml | 4 ++++
 2 files changed, 9 insertions(+)
 create mode 100644 releasenotes/notes/add-octavia-anti-affinity-parameters-fe9222f17b16ee1f.yaml

diff --git a/puppet/services/octavia-controller.yaml b/puppet/services/octavia-controller.yaml
index 61dbb59af3..ad4f67aafa 100644
--- a/puppet/services/octavia-controller.yaml
+++ b/puppet/services/octavia-controller.yaml
@@ -68,6 +68,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
 
 conditions:
   octavia_topology_unset: {equals : [{get_param: OctaviaLoadBalancerTopology}, ""]}
@@ -101,6 +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}
           -
             if:
             - octavia_topology_unset
diff --git a/releasenotes/notes/add-octavia-anti-affinity-parameters-fe9222f17b16ee1f.yaml b/releasenotes/notes/add-octavia-anti-affinity-parameters-fe9222f17b16ee1f.yaml
new file mode 100644
index 0000000000..4d76021e63
--- /dev/null
+++ b/releasenotes/notes/add-octavia-anti-affinity-parameters-fe9222f17b16ee1f.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Added the Octavia anti-affinity parameters.