Use mirsg infra collection #108
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
use version 1.20.0
This PR was deployed on the [arc-playpen-collaborations](https://ucl-cloud.awsapps.com/start/#/) and moves towards integrating the [updated ansible collection version 1.22.0](https://github.com/UCL-MIRSG/ansible-collection-infra) into this repo. Merge into `use-mirsg-infra-collection` branch before merging into `main` Changes in this PR: - Added `./show_resources_to_delete.sh` script to find VPC dependencies for manual deletion if `terraform destroy` command has been interrupted when deploying locally - `configure/playbooks/group_vars/xnat.yml` nginx_upstream_port changed which addresses [this issue in this repo at least](UCL-MIRSG/ansible-collection-infra#119) - `configure/playbooks/roles/setup_xnat_project/tasks/upload_data.yml` task added to remove python3-requests library before installing necessary Python dependencies on host - `configure/playbooks/templates/nginx_reverse_proxy_aws.j2` was added to fix nginx error caused by aws url being long - Changed group from `xnat_container_service` to `container_service` in `provision/templates/ansible_hosts.yml.tftpl` to match playbook names --------- Co-authored-by: ruaridhg <[email protected]> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Paul Smith <[email protected]>
ruaridhg
commented
Jun 27, 2024
There was a problem hiding this comment.
I did a self-review here since I opened the PR, but it was mostly @p-j-smith's commits so LGTM!
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #109
Fixes #102
Use Ansible roles from the
mirsg.infrastructureCollection for installing / configuring XNAT.mirsg.infrastructure.provisionrole is used instead)mirsg.infrastructure.nginxrolemirsg.infrastructureinclude a fix for Container service and XNAT compatible with Docker > 24 #102 (the Docker version is pinned to <25)There are a lot of changes here, but they are all internal (i.e. there are no changes in how to use this repo, and users shouldn't need to update their
terraform.tfvarsfiles etc.)