Merge "Bump taskflow version"

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

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

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,

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)

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