openstack/octavia
Code Issues Proposed changes

Bump taskflow version

Browse Source 
Taskflow 4.4.0 contains essential fix for jobboard behaviour on
Storage failure [1].

Also add jobboard_redis_sentinel parameter to allow usage sentinel
for Redis jobboard. Support of this also appear in 4.4.0 version.

[1] - https://docs.openstack.org/releasenotes/taskflow/unreleased.html#bug-fixes

Change-Id: I48245b3322b0f2e5f2c11594a15632501a7e4086
This commit is contained in:
Ann Taraday 2020-09-09 16:20:15 +04:00 committed by Michael Johnson
parent 4260d8a74b
commit befa073495
5 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/octavia.conf
View File

@ -391,6 +391,9 @@
# claims for it. (string value) # claims for it. (string value)
#jobboard_backend_namespace = octavia_jobboard #jobboard_backend_namespace = octavia_jobboard
# Sentinel name if it is used for Redis.
#jobboard_redis_sentinel = None
# Redis jobboard backend ssl configuration options. (dict value) # Redis jobboard backend ssl configuration options. (dict value)
# SSL is disabled by default # SSL is disabled by default
#jobboard_redis_backend_ssl_options = ssl:False,ssl_ca_certs:None,ssl_cert_reqs:required,ssl_certfile:None,ssl_keyfile:None #jobboard_redis_backend_ssl_options = ssl:False,ssl_ca_certs:None,ssl_cert_reqs:required,ssl_certfile:None,ssl_keyfile:None

2
lower-constraints.txt
View File

@ -152,7 +152,7 @@ sqlparse==0.2.4
statsd==3.2.2 statsd==3.2.2
stestr==2.0.0 stestr==2.0.0
stevedore==1.20.0 stevedore==1.20.0
taskflow==4.1.0 taskflow==4.4.0
tempest==17.1.0 tempest==17.1.0
Tempita==0.5.2 Tempita==0.5.2
tenacity==5.0.4 tenacity==5.0.4

2
octavia/common/config.py
View File

@ -544,6 +544,8 @@ task_flow_opts = [
cfg.StrOpt('jobboard_backend_namespace', default='octavia_jobboard', cfg.StrOpt('jobboard_backend_namespace', default='octavia_jobboard',
help='Jobboard name that should be used to store taskflow ' help='Jobboard name that should be used to store taskflow '
'job id and claims for it.'), 'job id and claims for it.'),
cfg.StrOpt('jobboard_redis_sentinel', default=None,
help='Sentinel name if it is used for Redis.'),
cfg.DictOpt('jobboard_redis_backend_ssl_options', cfg.DictOpt('jobboard_redis_backend_ssl_options',
help='Redis jobboard backend ssl configuration options.', help='Redis jobboard backend ssl configuration options.',
default={'ssl': False, default={'ssl': False,

1
octavia/controller/worker/v2/taskflow_jobboard_driver.py
View File

@ -93,6 +93,7 @@ class RedisTaskFlowDriver(JobboardTaskFlowDriver):
'port': CONF.task_flow.jobboard_backend_port, 'port': CONF.task_flow.jobboard_backend_port,
'password': CONF.task_flow.jobboard_backend_password, 'password': CONF.task_flow.jobboard_backend_password,
'namespace': CONF.task_flow.jobboard_backend_namespace, 'namespace': CONF.task_flow.jobboard_backend_namespace,
'sentinel': CONF.task_flow.jobboard_redis_sentinel,
} }
jobboard_backend_conf.update( jobboard_backend_conf.update(
CONF.task_flow.jobboard_redis_backend_ssl_options) CONF.task_flow.jobboard_redis_backend_ssl_options)

2
requirements.txt
View File

@ -37,7 +37,7 @@ python-cinderclient>=3.3.0 # Apache-2.0
pyOpenSSL>=19.1.0 # Apache-2.0 pyOpenSSL>=19.1.0 # Apache-2.0
WSME>=0.8.0 # MIT WSME>=0.8.0 # MIT
Jinja2>=2.10 # BSD License (3 clause) Jinja2>=2.10 # BSD License (3 clause)
taskflow>=4.1.0 # Apache-2.0 taskflow>=4.4.0 # Apache-2.0
diskimage-builder>=2.24.0 # Apache-2.0 diskimage-builder>=2.24.0 # Apache-2.0
castellan>=0.16.0 # Apache-2.0 castellan>=0.16.0 # Apache-2.0
tenacity>=5.0.4 # Apache-2.0 tenacity>=5.0.4 # Apache-2.0