Skip to content
This repository has been archived by the owner on Jan 15, 2024. It is now read-only.

Add default variables #13

Merged
merged 16 commits into from
Dec 22, 2023
Merged

Add default variables #13

merged 16 commits into from
Dec 22, 2023

Conversation

p-j-smith
Copy link
Contributor

@p-j-smith p-j-smith commented Dec 22, 2023 •
edited
Loading

Fixes #12

  • add some defaults to mirsr.infrastructure.xnat that currently need to be defined as group vars. These defaults use flat naming rather than nested, and are prefixed with the role name
  • remove server_locale from test inventory group vars as it is the same as the default in mirsg.infrastructure.provision
  • set defaults for the java_mem variable
  • add ansible_cache_dir as a playbook group var so we don't need to define it at the inventory level
  • there are other variables that could be made defaults in a separate PR but they are less straightforward for a couple of reasons:
    • they are used in multiple roles
    • they are used in the mirsg.infrastructure collection (and so should be defined as defaults in the relevant roles there)

@p-j-smith
Add ansible_cache_dir as a playbook group var
27c268e
@p-j-smith
no need to set server_locale - it has the same default in mirsg.infra…
9ce13b2 
…structure.provision
@p-j-smith
rename diffie_helman_size_bits to nginx_diffie_helman_size_bits
faa4131
@p-j-smith
make smtp a xnat role default
02662c6 
also make flat rather than nested
and prefix with xnat_
@p-j-smith
remove postgresql_version group vars as it is the same as the mirsg.i…
bbe85ae 
…nfrastructure.postgresql default
@p-j-smith
add xnat_plugin_ vars to xnat role defaults
27b5833
@p-j-smith
Set java_mem defaults
9eec023
@p-j-smith
Add ldap variable defaults for xnat role
e88dbce 
Make the vars flat rather than nested
Also prefix with xnat_
@p-j-smith
Add xnat_config_logo as a role default
c10e3dc
@p-j-smith
Rename pipline_engine_enabled to xnat_pipeline_engine_enabled
9859300 
Default to true
@p-j-smith
Remove unused container_service variables
474a2de
@p-j-smith
Add xnat_server_specific_plugin_urls and _packages to xnat role defaults
7fe3064
@p-j-smith
nginx_diffie_helman_size_bits should be diffie_helman_size_bits
c3e4497
@p-j-smith
We need to define postgresql_version
324d696
@p-j-smith
Update xnat_plugin_urls to latest versions
cfc27ec
@p-j-smith
Add default smtp password from the vault
3042102
@p-j-smith p-j-smith self-assigned this Dec 22, 2023
@p-j-smith p-j-smith requested a review from a team December 22, 2023 12:31
drmatthews
drmatthews approved these changes Dec 22, 2023
View reviewed changes
Copy link
Contributor

@drmatthews drmatthews left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Is this a good opportunity to renovate the plugin versions?

@p-j-smith
Copy link
Contributor Author

Is this a good opportunity to renovate the plugin versions?

Yeah good idea - I'll do it in a separate PR

@p-j-smith p-j-smith merged commit 6b9ec3b into main Dec 22, 2023
3 checks passed
@p-j-smith p-j-smith deleted the feat/add-deafults branch December 22, 2023 12:57
@paddyroddy
Copy link
Member

Looks good. Is this a good opportunity to renovate the plugin versions?

I had had this same thought

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@drmatthews drmatthews drmatthews approved these changes

Assignees

@p-j-smith p-j-smith

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

✏️ [TASK]: Add defaults for xnat role
3 participants
@p-j-smith @paddyroddy @drmatthews