From e5f62c7935117fd565d52e8128ac03f77ff96521 Mon Sep 17 00:00:00 2001
From: Kevin Carter <kecarter@redhat.com>
Date: Thu, 22 Oct 2020 10:07:23 -0500
Subject: [PATCH] Add SOURCE_IP_PORT to LB_ALGORITHM allowed values

This change adds SOURCE_IP_PORT to lb_algorithm property of
OS::Octavia::Pool resource which is missing from the available options
and required when using the OVN provider driver.

[0] https://docs.openstack.org/ovn-octavia-provider/latest/admin/driver.html#limitations-of-the-ovn-provider-driver
[1] https://docs.openstack.org/releasenotes/octavia/train.html

Story: 2008361
Task: 41268

Change-Id: Ibed37eea817a5125c5751b2bc9f44acf3c016fe1
Signed-off-by: Kevin Carter <kecarter@redhat.com>
(cherry picked from commit 20b599cdf893af5165b07b3d1f70864693ec35ff)
(cherry picked from commit 3cf3a68a40d6a12e6abc5f2dd582b7e66a66dabc)
(cherry picked from commit 49ef181bb229ded1131582a64fd4cba9be6fc953)
---
 heat/engine/resources/openstack/octavia/pool.py               | 4 ++--
 .../SOURCE_IP_PORT-to-LB_ALGORITHM-11f0edf22096df74.yaml      | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/SOURCE_IP_PORT-to-LB_ALGORITHM-11f0edf22096df74.yaml

diff --git a/heat/engine/resources/openstack/octavia/pool.py b/heat/engine/resources/openstack/octavia/pool.py
index 3e454468b2..5cb7455894 100644
--- a/heat/engine/resources/openstack/octavia/pool.py
+++ b/heat/engine/resources/openstack/octavia/pool.py
@@ -97,8 +97,8 @@ class Pool(octavia_base.OctaviaBase):
               'the pool.'),
             required=True,
             constraints=[
-                constraints.AllowedValues(['ROUND_ROBIN',
-                                           'LEAST_CONNECTIONS', 'SOURCE_IP']),
+                constraints.AllowedValues(['ROUND_ROBIN', 'LEAST_CONNECTIONS',
+                                           'SOURCE_IP', 'SOURCE_IP_PORT']),
             ],
             update_allowed=True,
         ),
diff --git a/releasenotes/notes/SOURCE_IP_PORT-to-LB_ALGORITHM-11f0edf22096df74.yaml b/releasenotes/notes/SOURCE_IP_PORT-to-LB_ALGORITHM-11f0edf22096df74.yaml
new file mode 100644
index 0000000000..6d18f29d52
--- /dev/null
+++ b/releasenotes/notes/SOURCE_IP_PORT-to-LB_ALGORITHM-11f0edf22096df74.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - The ``lb_algorithm`` property of ``OS::Octavia::Pool`` resource now supports
+    SOURCE_IP_PORT option required for Octavia OVN provider driver.