change BROKER_DB_INDEX to CELERY_DB_INDEX

inventory_provider/tasks/config.py

 import logging
 import os
-import re
 
 import redis.sentinel
 
@@ -9,7 +8,7 @@ logger = logging.getLogger(__name__)
 broker_hostname = os.getenv('BROKER_HOSTNAME')
 assert broker_hostname is not None
 broker_port = int(os.getenv('BROKER_PORT'))
-broker_db_index = int(os.getenv('BROKER_DB_INDEX'))
+broker_db_index = int(os.getenv('CELERY_DB_INDEX'))
 
 broker_scheme = os.getenv('BROKER_SCHEME', 'redis')
 assert broker_scheme in ('redis', 'sentinel'), 'unsupported broker scheme'
@@ -25,12 +24,14 @@ if broker_scheme == 'sentinel':
     broker_hostname = master[0]
     broker_port = master[1]
 
-if re.match(r'^[\d:]+$', broker_hostname):
-    # handle case where hostname is an ipv6 address
+if ':' in broker_hostname:
+    # assume this means hostname is an ipv6 address
     broker_hostname = '[%s]' % broker_hostname
 
 broker_url = 'redis://%s:%d/%d' % (
     broker_hostname, broker_port, broker_db_index)
 result_backend = broker_url
 
+logger.debug('broker_url: %r' % broker_url)
+
 task_eager_propagates = True

test/conftest.py

@@ -199,7 +199,7 @@ def mocked_worker_module(
 
     os.environ['BROKER_HOSTNAME'] = 'a.b.c'
     os.environ['BROKER_PORT'] = '123'
-    os.environ['BROKER_DB_INDEX'] = '456'
+    os.environ['CELERY_DB_INDEX'] = '456'
     os.environ['BROKER_SCHEME'] = 'redis'
 
     worker.InventoryTask.config = data_config