chore(signpost): deprecate and add INDEX_CLIENT (#47)

uc-cdis · Jul 5, 2019 · 96d53b9 · 96d53b9
1 parent d5f624a
commit 96d53b9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/templates/peregrine_settings.py b/templates/peregrine_settings.py
@@ -13,11 +13,16 @@ def load_json(file_name):
 config["AUTH_ADMIN_CREDS"] = None
 config["INTERNAL_AUTH"] = None
 
-# Signpost - coordinate auth with values in indexd_setup.sh
+# SIGNPOST is deprecated, replaced by INDEX_CLIENT (peregrine>=1.3.0)
 config['SIGNPOST'] = {
     'host': environ.get('SIGNPOST_HOST', 'http://indexd-service'),
     'version': 'v0',
-    'auth': ('indexd_client', conf_data.get( 'indexd_password', '{{indexd_password}}')),
+    'auth': ('indexd_client', conf_data.get('indexd_password', '{{indexd_password}}')),
+}
+config['INDEX_CLIENT'] = {
+    'host': environ.get('INDEX_CLIENT_HOST', 'http://indexd-service'),
+    'version': 'v0',
+    'auth': ('indexd_client', conf_data.get('indexd_password', '{{indexd_password}}')),
 }
 config["FAKE_AUTH"] = False
 config["PSQLGRAPH"] = {

diff --git a/templates/sheepdog_settings.py b/templates/sheepdog_settings.py
@@ -13,12 +13,17 @@ def load_json(file_name):
 config["AUTH_ADMIN_CREDS"] = None
 config["INTERNAL_AUTH"] = None
 
-# Signpost - coordinate auth with values in indexd_setup.sh
+# SIGNPOST is deprecated, replaced by INDEX_CLIENT (sheepdog>=1.1.12)
 config['SIGNPOST'] = {
     'host': environ.get('SIGNPOST_HOST', 'http://indexd-service'),
     'version': 'v0',
     'auth': ('indexd_client', conf_data.get('indexd_password', '{{indexd_password}}')),
 }
+config["INDEX_CLIENT"] = {
+    'host': environ.get('INDEX_CLIENT_HOST', 'http://indexd-service'),
+    'version': 'v0',
+    'auth': ('indexd_client', conf_data.get('indexd_password', '{{indexd_password}}')),
+}
 config["FAKE_AUTH"] = False
 config["PSQLGRAPH"] = {
     'host': conf_data['db_host'],