diff --git a/heat/engine/resources/openstack/octavia/health_monitor.py b/heat/engine/resources/openstack/octavia/health_monitor.py index fbe33ee625..87d2edc277 100644 --- a/heat/engine/resources/openstack/octavia/health_monitor.py +++ b/heat/engine/resources/openstack/octavia/health_monitor.py @@ -106,7 +106,8 @@ class HealthMonitor(octavia_base.OctaviaBase): _('One of predefined health monitor types.'), required=True, constraints=[ - constraints.AllowedValues(['PING', 'TCP', 'HTTP', 'HTTPS']), + constraints.AllowedValues(['PING', 'TCP', 'HTTP', 'HTTPS', + 'UDP-CONNECT']), ] ), URL_PATH: properties.Schema( diff --git a/heat/engine/resources/openstack/octavia/listener.py b/heat/engine/resources/openstack/octavia/listener.py index ad2ee82b38..c001caa73b 100644 --- a/heat/engine/resources/openstack/octavia/listener.py +++ b/heat/engine/resources/openstack/octavia/listener.py @@ -37,8 +37,8 @@ class Listener(octavia_base.OctaviaBase): 'sni_container_refs', 'connection_limit', 'tenant_id' ) - SUPPORTED_PROTOCOLS = (TCP, HTTP, HTTPS, TERMINATED_HTTPS, PROXY) = ( - 'TCP', 'HTTP', 'HTTPS', 'TERMINATED_HTTPS', 'PROXY') + SUPPORTED_PROTOCOLS = (TCP, HTTP, HTTPS, TERMINATED_HTTPS, PROXY, UDP) = ( + 'TCP', 'HTTP', 'HTTPS', 'TERMINATED_HTTPS', 'PROXY', 'UDP') ATTRIBUTES = ( LOADBALANCERS_ATTR, DEFAULT_POOL_ID_ATTR diff --git a/heat/engine/resources/openstack/octavia/pool.py b/heat/engine/resources/openstack/octavia/pool.py index 81737c23b7..3e454468b2 100644 --- a/heat/engine/resources/openstack/octavia/pool.py +++ b/heat/engine/resources/openstack/octavia/pool.py @@ -44,8 +44,8 @@ class Pool(octavia_base.OctaviaBase): 'SOURCE_IP', 'HTTP_COOKIE', 'APP_COOKIE' ) - SUPPORTED_PROTOCOLS = (TCP, HTTP, HTTPS, TERMINATED_HTTPS, PROXY) = ( - 'TCP', 'HTTP', 'HTTPS', 'TERMINATED_HTTPS', 'PROXY') + SUPPORTED_PROTOCOLS = (TCP, HTTP, HTTPS, TERMINATED_HTTPS, PROXY, UDP) = ( + 'TCP', 'HTTP', 'HTTPS', 'TERMINATED_HTTPS', 'PROXY', 'UDP') ATTRIBUTES = ( HEALTHMONITOR_ID_ATTR, LISTENERS_ATTR, MEMBERS_ATTR diff --git a/releasenotes/notes/add-udp-support-octavia-593dca738ab2ef57.yaml b/releasenotes/notes/add-udp-support-octavia-593dca738ab2ef57.yaml new file mode 100644 index 0000000000..fc1f016746 --- /dev/null +++ b/releasenotes/notes/add-udp-support-octavia-593dca738ab2ef57.yaml @@ -0,0 +1,3 @@ +--- +features: + - Add UDP to supported protocols for Octavia.