Skip to content

Commit 63e3d87

Browse files
committed
Allow empty items in extra package and user lists
This enables defining extra packages and users based on some conditions. For example: appliances_extra_packages_other: - "{{ 'cuda-toolkit' if 'cuda' in group_names }}"
1 parent 8113fbe commit 63e3d87

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

environments/common/inventory/group_vars/all/defaults.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ appliances_local_users_default:
7979

8080
# Overide this to add extra users whilst keeping the defaults.
8181
appliances_local_users_extra: [] # see format of appliances_local_users_default above
82-
appliances_local_users: "{{ appliances_local_users_default + appliances_local_users_extra }}"
82+
appliances_local_users: "{{ (appliances_local_users_default + appliances_local_users_extra) | select | list }}"
8383

8484
################## bootstrap: extra package installs ######################################
8585

@@ -97,7 +97,7 @@ appliances_extra_packages_default:
9797

9898
appliances_extra_packages_other: []
9999

100-
appliances_extra_packages: "{{ appliances_extra_packages_default + appliances_extra_packages_other }}"
100+
appliances_extra_packages: "{{ (appliances_extra_packages_default + appliances_extra_packages_other) | select | list }}"
101101

102102
###################### ark repo timestamps ###################################################
103103

environments/common/inventory/group_vars/all/openhpc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ openhpc_packages_default:
2828
- apptainer
2929
- podman-compose
3030
openhpc_packages_extra: []
31-
openhpc_packages: "{{ openhpc_packages_default + openhpc_packages_extra }}"
31+
openhpc_packages: "{{ (openhpc_packages_default + openhpc_packages_extra) | select | list }}"
3232
openhpc_munge_key: "{{ vault_openhpc_mungekey | b64decode }}"
3333
openhpc_login_only_nodes: login
3434
openhpc_config_default:

0 commit comments

Comments
 (0)