From befa0734956e2161563f0ad7e1c770b5a5f78c0b Mon Sep 17 00:00:00 2001 From: Ann Taraday Date: Wed, 9 Sep 2020 16:20:15 +0400 Subject: [PATCH] Bump taskflow version 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 --- etc/octavia.conf | 3 +++ lower-constraints.txt | 2 +- octavia/common/config.py | 2 ++ octavia/controller/worker/v2/taskflow_jobboard_driver.py | 1 + requirements.txt | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/etc/octavia.conf b/etc/octavia.conf index 8daf95a8ce..1c8e9f7572 100644 --- a/etc/octavia.conf +++ b/etc/octavia.conf @@ -391,6 +391,9 @@ # claims for it. (string value) #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) # 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 diff --git a/lower-constraints.txt b/lower-constraints.txt index 380363bef6..70ca246bce 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -152,7 +152,7 @@ sqlparse==0.2.4 statsd==3.2.2 stestr==2.0.0 stevedore==1.20.0 -taskflow==4.1.0 +taskflow==4.4.0 tempest==17.1.0 Tempita==0.5.2 tenacity==5.0.4 diff --git a/octavia/common/config.py b/octavia/common/config.py index 3a551cf0f2..ae3c9794b8 100644 --- a/octavia/common/config.py +++ b/octavia/common/config.py @@ -544,6 +544,8 @@ task_flow_opts = [ cfg.StrOpt('jobboard_backend_namespace', default='octavia_jobboard', help='Jobboard name that should be used to store taskflow ' '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', help='Redis jobboard backend ssl configuration options.', default={'ssl': False, diff --git a/octavia/controller/worker/v2/taskflow_jobboard_driver.py b/octavia/controller/worker/v2/taskflow_jobboard_driver.py index 11f75da1b6..d8595d7c56 100644 --- a/octavia/controller/worker/v2/taskflow_jobboard_driver.py +++ b/octavia/controller/worker/v2/taskflow_jobboard_driver.py @@ -93,6 +93,7 @@ class RedisTaskFlowDriver(JobboardTaskFlowDriver): 'port': CONF.task_flow.jobboard_backend_port, 'password': CONF.task_flow.jobboard_backend_password, 'namespace': CONF.task_flow.jobboard_backend_namespace, + 'sentinel': CONF.task_flow.jobboard_redis_sentinel, } jobboard_backend_conf.update( CONF.task_flow.jobboard_redis_backend_ssl_options) diff --git a/requirements.txt b/requirements.txt index adf16a8455..17df8d49ed 100644 --- a/requirements.txt +++ b/requirements.txt @@ -37,7 +37,7 @@ python-cinderclient>=3.3.0 # Apache-2.0 pyOpenSSL>=19.1.0 # Apache-2.0 WSME>=0.8.0 # MIT 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 castellan>=0.16.0 # Apache-2.0 tenacity>=5.0.4 # Apache-2.0