openstack/octavia
Code Issues Proposed changes

Merge "Use common escape_ipv6 utility to escape IPv6 addresses"

Browse Source
This commit is contained in:
Zuul 2024-10-28 09:19:43 +00:00 committed by Gerrit Code Review
commit 209c67e5e2
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ import contextlib
from oslo_config import cfg
from oslo_log import log
from oslo_utils import netutils
from oslo_utils import strutils
from taskflow.jobs import backends as job_backends
from taskflow.persistence import backends as persistence_backends
@ -90,11 +91,6 @@ class RedisTaskFlowDriver(JobboardTaskFlowDriver):
def job_board(self, persistence):
def _format_server(host, port):
if ':' in host:
return '[%s]:%d' % (host, port)
return '%s:%d' % (host, port)
jobboard_backend_conf = {
'board': 'redis',
'host': CONF.task_flow.jobboard_backend_hosts[0],
@ -103,7 +99,8 @@ class RedisTaskFlowDriver(JobboardTaskFlowDriver):
'namespace': CONF.task_flow.jobboard_backend_namespace,
'sentinel': CONF.task_flow.jobboard_redis_sentinel,
'sentinel_fallbacks': [
_format_server(host, CONF.task_flow.jobboard_backend_port)
'%s:%d' % (netutils.escape_ipv6(host),
CONF.task_flow.jobboard_backend_port)
for host in CONF.task_flow.jobboard_backend_hosts[1:]
]
}