Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(arborist-url) #304

Merged
merged 3 commits into from
Oct 4, 2019
Merged

fix(arborist-url) #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
601312f
fix(arborist-url)
paulineribeyre Oct 4, 2019
eccb4dc
fix(arborist-url): get env var in app_init instead of config
paulineribeyre Oct 4, 2019
c84f484
fix(arborist-url): backwards compatible
paulineribeyre Oct 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions sheepdog/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,10 @@ def app_init(app):
except KeyError:
app.logger.error("Secret key not set in config! Authentication will not work")

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()
Expand Down
2 changes: 0 additions & 2 deletions sheepdog/dev_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
"user_domain_name": env.get("KEYSTONE_DOMAIN"),
}

ARBORIST = "http://arborist-service/"

# Storage
CLEVERSAFE_HOST = env.get("CLEVERSAFE_HOST", "cleversafe.service.consul")

Expand Down
2 changes: 0 additions & 2 deletions sheepdog/test_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
"user_domain_name": "some_domain",
}

ARBORIST = "http://arborist-service/"

SUBMISSION = {"bucket": "test_submission", "host": "host"}


Expand Down