Get ARBORIST_URL from manifest (#142)

uc-cdis · Oct 4, 2019 · ec772e9 · ec772e9
1 parent 39cb859
commit ec772e9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/peregrine/api.py b/peregrine/api.py
@@ -133,8 +133,10 @@ def app_init(app):
         )
     async_pool_init(app)
 
-    if app.config.get("ARBORIST"):
-        app.auth = ArboristClient(arborist_base_url=app.config["ARBORIST"])
+    # ARBORIST deprecated, replaced by ARBORIST_URL
+    arborist_url = os.environ.get("ARBORIST_URL", os.environ.get("ARBORIST"))
+    if arborist_url:
+        app.auth = ArboristClient(arborist_base_url=arborist_url)
     else:
         app.logger.info("Using default Arborist base URL")
         app.auth = ArboristClient()

diff --git a/peregrine/dev_settings.py b/peregrine/dev_settings.py
@@ -19,8 +19,6 @@
     'auth_url': env.get('KEYSTONE_AUTH_URL'),
     'user_domain_name': env.get('KEYSTONE_DOMAIN')}
 
-ARBORIST = "http://arborist-service/"
-
 # Storage
 CLEVERSAFE_HOST = env.get('CLEVERSAFE_HOST', 'cleversafe.service.consul')
 

diff --git a/peregrine/test_settings.py b/peregrine/test_settings.py
@@ -15,8 +15,6 @@
     'user_domain_name': 'some_domain',
 }
 
-ARBORIST = "http://arborist-service/"
-
 SUBMISSION = {
     "bucket": 'test_submission',
     "host": 'host',