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.

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

Use mirsg infra collection #108

Merged
merged 10 commits into from
Jun 28, 2024
Merged

Use mirsg infra collection #108

merged 10 commits into from
Jun 28, 2024

Commits on May 31, 2024

  1. Configuration menu
    Copy the full SHA
    91918b9 View commit details
    Browse the repository at this point in the history
  2. use mirsg.infrastructure colleciton

    use version 1.20.0
    p-j-smith committed May 31, 2024
    Configuration menu
    Copy the full SHA
    ab82991 View commit details
    Browse the repository at this point in the history
  3. remove duplicated vars

    p-j-smith committed May 31, 2024
    Configuration menu
    Copy the full SHA
    e4946de View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5bc3e85 View commit details
    Browse the repository at this point in the history
  5. remove unused playbooks

    p-j-smith committed May 31, 2024
    Configuration menu
    Copy the full SHA
    ab0e8d8 View commit details
    Browse the repository at this point in the history
  6. remove unused roles

    p-j-smith committed May 31, 2024
    Configuration menu
    Copy the full SHA
    71cc04e View commit details
    Browse the repository at this point in the history
  7. fix variable names

    p-j-smith committed May 31, 2024
    Configuration menu
    Copy the full SHA
    3310884 View commit details
    Browse the repository at this point in the history
  8. ignore xnat vault

    p-j-smith committed May 31, 2024
    Configuration menu
    Copy the full SHA
    3cdd38c View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Fixes for integrating updated ansible collection (#106)

    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]>
    4 people authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    0f53b3a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    eb12151 View commit details
    Browse the repository at this point in the history