Merge "redis: Add username"

octavia/common/config.py

@@ -579,7 +579,9 @@ task_flow_opts = [
                 help='Jobboard backend server host(s).'),
     cfg.PortOpt('jobboard_backend_port', default=6379,
                 help='Jobboard backend server port'),
-    cfg.StrOpt('jobboard_backend_password', default='', secret=True,
+    cfg.StrOpt('jobboard_backend_username',
+               help='Jobboard backend server user name'),
+    cfg.StrOpt('jobboard_backend_password', secret=True,
                help='Jobboard backend server password'),
     cfg.StrOpt('jobboard_backend_namespace', default='octavia_jobboard',
                help='Jobboard name that should be used to store taskflow '

octavia/controller/worker/v2/taskflow_jobboard_driver.py

@@ -92,10 +92,15 @@ class RedisTaskFlowDriver(JobboardTaskFlowDriver):
             'board': 'redis',
             'host': CONF.task_flow.jobboard_backend_hosts[0],
             '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,
         }
+        if CONF.task_flow.jobboard_backend_username is not None:
+            jobboard_backend_conf['username'] = (
+                CONF.task_flow.jobboard_backend_username)
+        if CONF.task_flow.jobboard_backend_password is not None:
+            jobboard_backend_conf['password'] = (
+                CONF.task_flow.jobboard_backend_password)
         jobboard_backend_conf.update(
             CONF.task_flow.jobboard_redis_backend_ssl_options)
         return job_backends.backend(

requirements.txt

@@ -40,7 +40,7 @@ python-novaclient>=9.1.0 # Apache-2.0
 python-cinderclient>=3.3.0 # Apache-2.0
 WSME>=0.8.0 # MIT
 Jinja2>=2.10 # BSD License (3 clause)
-taskflow>=4.4.0 # Apache-2.0
+taskflow>=5.5.0 # Apache-2.0
 castellan>=0.16.0 # Apache-2.0
 tenacity>=5.0.4  # Apache-2.0
 distro>=1.2.0 # Apache-2.0

setup.cfg

@@ -114,7 +114,7 @@ oslo.middleware.healthcheck =
 [extras]
 # Required in case of AmphoraV2 redis jobboard is used
 redis =
-    redis>=2.10.0
+    redis>=3.4.0
 # Required in case of AmphoraV2 zookeeper jobboard is used
 zookeeper =
   kazoo>=2.6.0 # Apache-2.0