Skip to content

Commit

Permalink
Add xnat group for tests
Browse files Browse the repository at this point in the history
  • Loading branch information
drmatthews committed Mar 26, 2024
1 parent d5e1f81 commit a838d85
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
external_storage_drive: "/storage/xnat"
external_storage_drive: /storage/xnat

# web server VM
# URL is localhost:8080
Expand All @@ -19,8 +19,8 @@ db_server:
host: "{{ hostvars['xnat_db']['hostname'] }}"
port: 5432
listen_addresses: "*"
postgresql_database: "xnat"
postgresql_user: "xnat"
postgresql_database: xnat
postgresql_user: xnat
postgresql_password: "{{ vault_postgres_xnat_password }}"
storage_dir: "{{ external_storage_drive }}/pgsql"
data_dir: "{{ external_storage_drive }}/pgsql/{{ postgresql_version }}/data"
Expand All @@ -36,9 +36,3 @@ xnat_config:
site_name: MIRSG_XNAT
site_description: <h1>MIRSG XNAT</h1><p>A test instance of XNAT.
admin_password: "{{ vault_admin_password }}"

# mirsg.xnat.xnat
# Some times the default admin account hasn't finished creating even after tomcat has started
# Add a delay here to give the admin account a chance to be created
# Note, this issue only seems to happen in CI
xnat_wait_for_tomcat: 15
15 changes: 15 additions & 0 deletions playbooks/molecule/resources/xnat/inventory/group_vars/xnat.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
# mirsg.infrastructure.firewalld
firewalld_allow_public_access: true

firewalld_public_zone_sources:
- "0.0.0.0/0"

# mirsg.xnat.xnat
# Some times the default admin account hasn't finished creating even after tomcat has started
# Add a delay here to give the admin account a chance to be created
# Note, this issue only seems to happen in CI
xnat_wait_for_tomcat: 15

# nginx config
nginx_add_default_server: false # set Tomcat as default server to allow access to XNAT web UI through localhost:8000

0 comments on commit a838d85

Please sign in to comment.