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.

Sign up for GitHub

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

Fixed issue with variable values not getting picked up from the static inventory due to precedence. #624

Merged
merged 1 commit into from
Sep 1, 2022
Merged

Fixed issue with variable values not getting picked up from the static inventory due to precedence. #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions group_vars/irods.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ iptables_allow_https_inbound:
- ANY # For DAVRODS.
iptables_allow_irods:
- ANY
iptables_allow_postgres_outbound:
iptables_allow_postgresql_outbound:
- ANY

ssh_host_signer_hostnames: "{{ ansible_fqdn }},{{ ansible_hostname }},{{ inventory_hostname }}\
{% for host in groups['jumphost'] %},{{ host }}+{{ ansible_hostname }}{% endfor %}\
{% for host in groups['jumphost'] %},{{ host }}+{{ inventory_hostname }}{% endfor %}"
ir_version: '-4.2.11*' # if defined (empty): version will be installed (must start with '-' and end with '*')
ir_server_type: 'icat' # iRODS Server Type
ir_client_server_policy: 'CS_NEG_REQUIRE' # communicating using SSL (CS_NEG_REQUIRE) or without (CS_NEG_REFUSE
Expand Down
9 changes: 3 additions & 6 deletions static_inventories/nibbler_cluster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ all:
# ir_local_stage_res_fol: '/tmp/irods/{{ ir_local_stage_res }}'
# ir_local_perm_res: 'demoRescPerm' # Permanent resource, where it will keep data indefinitely
# ir_local_perm_res_fol: '/tmp/irods/{{ ir_local_perm_res }}'
iptables_allow_ssh_outbound: []
iptables_allow_irods:
- "{{ all.ip_addresses['surfsara']['umcg-resc1'] }}"
irods-test:
fqdn: umcg-icat01.hpc.rug.nl
ir_client_server_policy: 'CS_NEG_REFUSE' # communicating using (default) SSL (CS_NEG_REQUIRE) or without (CS_NEG_REFUSE
Expand All @@ -55,13 +58,7 @@ all:
vars:
cloud_flavor: m1.large
local_volume_size_extra: 20
ssh_host_signer_hostnames: "{{ ansible_fqdn }},{{ ansible_hostname }},{{ inventory_hostname }}\
{% for host in groups['jumphost'] %},{{ host }}+{{ ansible_hostname }}{% endfor %}\
{% for host in groups['jumphost'] %},{{ host }}+{{ inventory_hostname }}{% endfor %}"
davrods_icat_ip: "{{ ip_addresses[inventory_hostname][network_private_management_id]['address'] }}"
iptables_allow_ssh_outbound: []
iptables_allow_irods:
- "{{ all.ip_addresses['surfsara']['umcg-resc1'] }}"
docs:
hosts:
docs_on_merlin:
Expand Down