Support tls_enabled for Octavia pool
Adding support `tls_enabled` property for the resource `OS::Octavia::Pool`, the property is allowed to be updated as well. The property 'tls_enabled' was introduced in Octavia since Stein release. The default value is False if it is not specified in Heat template. Task: 30926 Story: 2005646 Change-Id: I1de9154e5e2ba9f246b2785f18ce7891e69ec25c
This commit is contained in:
@@ -17,6 +17,7 @@ from heat.engine import attributes
|
|||||||
from heat.engine import constraints
|
from heat.engine import constraints
|
||||||
from heat.engine import properties
|
from heat.engine import properties
|
||||||
from heat.engine.resources.openstack.octavia import octavia_base
|
from heat.engine.resources.openstack.octavia import octavia_base
|
||||||
|
from heat.engine import support
|
||||||
from heat.engine import translation
|
from heat.engine import translation
|
||||||
|
|
||||||
|
|
||||||
@@ -32,10 +33,11 @@ class Pool(octavia_base.OctaviaBase):
|
|||||||
ADMIN_STATE_UP, DESCRIPTION, SESSION_PERSISTENCE, NAME,
|
ADMIN_STATE_UP, DESCRIPTION, SESSION_PERSISTENCE, NAME,
|
||||||
LB_ALGORITHM, LISTENER, LOADBALANCER, PROTOCOL,
|
LB_ALGORITHM, LISTENER, LOADBALANCER, PROTOCOL,
|
||||||
SESSION_PERSISTENCE_TYPE, SESSION_PERSISTENCE_COOKIE_NAME,
|
SESSION_PERSISTENCE_TYPE, SESSION_PERSISTENCE_COOKIE_NAME,
|
||||||
|
TLS_ENABLED,
|
||||||
) = (
|
) = (
|
||||||
'admin_state_up', 'description', 'session_persistence', 'name',
|
'admin_state_up', 'description', 'session_persistence', 'name',
|
||||||
'lb_algorithm', 'listener', 'loadbalancer', 'protocol',
|
'lb_algorithm', 'listener', 'loadbalancer', 'protocol',
|
||||||
'type', 'cookie_name'
|
'type', 'cookie_name', 'tls_enabled',
|
||||||
)
|
)
|
||||||
|
|
||||||
SESSION_PERSISTENCE_TYPES = (
|
SESSION_PERSISTENCE_TYPES = (
|
||||||
@@ -124,6 +126,13 @@ class Pool(octavia_base.OctaviaBase):
|
|||||||
constraints.AllowedValues(SUPPORTED_PROTOCOLS),
|
constraints.AllowedValues(SUPPORTED_PROTOCOLS),
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
|
TLS_ENABLED: properties.Schema(
|
||||||
|
properties.Schema.BOOLEAN,
|
||||||
|
_('Enable backend member re-encryption.'),
|
||||||
|
default=False,
|
||||||
|
update_allowed=True,
|
||||||
|
support_status=support.SupportStatus(version='14.0.0'),
|
||||||
|
),
|
||||||
}
|
}
|
||||||
|
|
||||||
attributes_schema = {
|
attributes_schema = {
|
||||||
|
|||||||
@@ -87,7 +87,8 @@ class PoolTest(common.HeatTestCase):
|
|||||||
'listener_id': '123',
|
'listener_id': '123',
|
||||||
'loadbalancer_id': 'my_lb',
|
'loadbalancer_id': 'my_lb',
|
||||||
'protocol': 'HTTP',
|
'protocol': 'HTTP',
|
||||||
'admin_state_up': True
|
'admin_state_up': True,
|
||||||
|
'tls_enabled': False,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- Support ``tls_enabled`` property for the resource ``OS::Octavia::Pool``, the
|
||||||
|
property is allowed to be updated as well. The property 'tls_enabled' was
|
||||||
|
introduced in Octavia since Stein release. The default value is False if it
|
||||||
|
is not specified in Heat template.
|
||||||
Reference in New Issue
Block a user