From 520f327f5abfa4f3ff7d998644b39e8be9b5f484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Wed, 3 Jan 2018 18:34:33 +0100 Subject: [PATCH 1/2] Default ELASTIC_SEARCH_HOSTS to the host/docker name we use in production Also removed some comments that didn't add any new information. --- pillar/config.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pillar/config.py b/pillar/config.py index 48d9e44e..63f89967 100644 --- a/pillar/config.py +++ b/pillar/config.py @@ -80,9 +80,8 @@ ALGOLIA_INDEX_NODES = 'dev_Nodes' SEARCH_BACKENDS = ('algolia', 'elastic') # search backend we use -ELASTIC_SEARCH_HOSTS = ['elasticsearch'] # elasticsearch hosts +ELASTIC_SEARCH_HOSTS = ['elastic'] ELASTIC_INDICES = { - # elasticsearch indexes 'NODE': 'nodes', 'USER': 'users', } From 96428d3c73acc8563fd381583765938c603bcaed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Wed, 3 Jan 2018 18:34:55 +0100 Subject: [PATCH 2/2] Elastic: use different indices when running unit tests. --- pillar/tests/config_testing.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pillar/tests/config_testing.py b/pillar/tests/config_testing.py index f0f4ba21..04555821 100644 --- a/pillar/tests/config_testing.py +++ b/pillar/tests/config_testing.py @@ -35,3 +35,8 @@ OAUTH_CREDENTIALS = { 'secret': 'google-secret' } } + +ELASTIC_INDICES = { + 'NODE': 'test_nodes', + 'USER': 'test_users', +}