Skip to content

Commit

Permalink
fix weaver data-source resolution for workflow steps
Browse files Browse the repository at this point in the history
  • Loading branch information
fmigneault committed Jun 5, 2024
1 parent b229634 commit 664ca47
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
9 changes: 8 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,14 @@
[Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest)
------------------------------------------------------------------------------------------------------------------

[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
## Fixes
- Weaver: Adjust invalid `data_sources.yml` definitions.

- Add the missing `data_sources.yml` volume mount for `weaver-worker`.
- When `weaver-worker` runs a `Workflow`, the nested `step` process locations need to be resolved according to the
current `"localhost"` instance. However, the Web API running in `weaver` service is not visible from the worker.
Since the configuration is shared between `weaver` and `weaver-worker`, use the public endpoint of `weaver` to
make process URL resolution consistent, and also provide more useful references in job logs when resolution fails.

[2.4.0](https://github.com/bird-house/birdhouse-deploy/tree/2.4.0) (2024-06-04)
------------------------------------------------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Employed by default for looking at files available directly (e.g.: pre-fetched)
localhost:
netloc: "localhost"
ades: "http://localhost:4001"
ades: "https://${BIRDHOUSE_FQDN_PUBLIC}/${WEAVER_MANAGER_NAME}"
default: true

# Weaver self-reference, but using the exposed endpoint on the birdhouse instance
Expand Down
1 change: 1 addition & 0 deletions birdhouse/components/weaver/docker-compose-extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ services:
volumes:
#- wps_private:/data/wps_private
- ./components/weaver/config/weaver/weaver.ini:/opt/local/src/weaver/config/weaver.ini:ro
- ./components/weaver/config/weaver/data_sources.yml:/opt/local/src/weaver/config/data_sources.yml:ro
- ./components/weaver/config/weaver/request_options.yml:/opt/local/src/weaver/config/request_options.yml:ro
- ./components/weaver/celery-healthcheck:/opt/local/bin/weaver/celery-healthcheck:ro
# WARNING:
Expand Down

0 comments on commit 664ca47

Please sign in to comment.