diff --git a/api/base/settings/defaults.py b/api/base/settings/defaults.py index bedb32cac172..e928dc1412e1 100644 --- a/api/base/settings/defaults.py +++ b/api/base/settings/defaults.py @@ -317,12 +317,15 @@ # django-elasticsearch-metrics ELASTICSEARCH_DSL = { 'default': { - 'hosts': os.environ.get('ELASTIC6_URI', '192.168.168.167:9201'), + 'hosts': osf_settings.ELASTIC6_URI, 'retry_on_timeout': True, }, } # Store yearly indices for time-series metrics ELASTICSEARCH_METRICS_DATE_FORMAT = '%Y' +ELASTIC6_URI = os.environ.get('ELASTIC6_URI', '127.0.0.1:9201') + + WAFFLE_CACHE_NAME = 'waffle_cache' STORAGE_USAGE_CACHE_NAME = 'storage_usage' diff --git a/conftest.py b/conftest.py index 202cd801e8b7..2eb51df076ed 100644 --- a/conftest.py +++ b/conftest.py @@ -124,7 +124,7 @@ def _test_speedups_disable(request, settings, _test_speedups): @pytest.fixture(scope='session') def setup_connections(): - connections.create_connection(hosts=['http://192.168.168.167:9201']) + connections.create_connection(hosts=[website_settings.ELASTIC6_URI]) @pytest.fixture(scope='function')