summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-01-19 17:49:51 +0000
committerGerrit Code Review <review@openstack.org>2021-01-19 17:49:51 +0000
commit47bf7afe82d41e143cdd140b702e9d86e500491b (patch)
tree612428a1b4992c7b711b6f2837ff605884827e3f
parentd8027e65c15bac94d8c730fe3dafb957198bd481 (diff)
parent3cf3a68a40d6a12e6abc5f2dd582b7e66a66dabc (diff)
downloadheat-47bf7afe82d41e143cdd140b702e9d86e500491b.tar.gz
Merge "Add SOURCE_IP_PORT to LB_ALGORITHM allowed values" into stable/victoria
-rw-r--r--heat/engine/resources/openstack/octavia/pool.py4
-rw-r--r--releasenotes/notes/SOURCE_IP_PORT-to-LB_ALGORITHM-11f0edf22096df74.yaml4
2 files changed, 6 insertions, 2 deletions
diff --git a/heat/engine/resources/openstack/octavia/pool.py b/heat/engine/resources/openstack/octavia/pool.py
index 9bb541aea..625483736 100644
--- a/heat/engine/resources/openstack/octavia/pool.py
+++ b/heat/engine/resources/openstack/octavia/pool.py
@@ -99,8 +99,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 000000000..6d18f29d5
--- /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.