Skip to content
Snippets Groups Projects

Add redis auth credentials to celery backend config.

Merged Neda Moeini requested to merge feature/DBOARD3-752 into develop
@@ -22,12 +22,14 @@ with open(os.environ['INVENTORY_PROVIDER_CONFIG_FILENAME']) as f:
if 'sentinel' in inventory_provider_config:
params = inventory_provider_config['sentinel']
_broker_scheme = 'sentinel'
_broker_password = params.get('password')
broker_transport_options['master_name'] = params['name']
sentinel_socket_timeout = params.get(
'sentinel_socket_timeout', DEFAULT_SENTINEL_SOCKET_TIMEOUT)
else:
params = inventory_provider_config['redis']
_broker_scheme = 'redis'
_broker_password = params.get('password')
redis_socket_timeout = params.get(
'redis_socket_timeout', DEFAULT_REDIS_SOCKET_TIMEOUT)
@@ -41,8 +43,12 @@ if ':' in _broker_hostname:
# assume this means hostname is an ipv6 address
_broker_hostname = f'[{_broker_hostname}]'
broker_url = result_backend = (f'{_broker_scheme}://{_broker_hostname}'
f':{_broker_port}/{_broker_db_index}')
broker_url = result_backend = (
f'{_broker_scheme}://'
f'{"" if not _broker_password else f":{_broker_password}@"}'
f'{_broker_hostname}:{_broker_port}/{_broker_db_index}'
)
logger.debug('broker_url: %r' % broker_url)
task_eager_propagates = True
Loading