Skip to content

Allow empty items in extra package and user lists #637

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

Merged
merged 1 commit into from
Apr 25, 2025
Merged

Allow empty items in extra package and user lists #637

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
14 changes: 7 additions & 7 deletions environments/common/inventory/group_vars/all/defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ appliances_local_users_default:
home: /var/lib/{{ appliances_local_users_ansible_user_name }}
move_home: true
local: true

- user: "{{ appliances_local_users_podman }}"
enable: "{{ 'podman' in group_names }}"

Expand All @@ -53,7 +53,7 @@ appliances_local_users_default:
shell: /sbin/nologin
uid: 202
system: true

- group:
name: prometheus
gid: 976
Expand All @@ -64,7 +64,7 @@ appliances_local_users_default:
shell: /usr/sbin/nologin
system: true
enable: "{{ 'prometheus' in group_names }}"

- group:
name: grafana
gid: 979
Expand All @@ -79,7 +79,7 @@ appliances_local_users_default:

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

################## bootstrap: extra package installs ######################################

Expand All @@ -94,7 +94,7 @@ appliances_extra_packages_default:
- postfix
- git
- "{{ 'python36' if ansible_distribution_version == '8.9' else 'python312' }}"

appliances_extra_packages_other: []
appliances_extra_packages: "{{ appliances_extra_packages_default + appliances_extra_packages_other }}"

appliances_extra_packages: "{{ (appliances_extra_packages_default + appliances_extra_packages_other) | select | list }}"
2 changes: 1 addition & 1 deletion environments/common/inventory/group_vars/all/openhpc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ openhpc_packages_default:
- apptainer
- podman-compose
openhpc_packages_extra: []
openhpc_packages: "{{ openhpc_packages_default + openhpc_packages_extra }}"
openhpc_packages: "{{ (openhpc_packages_default + openhpc_packages_extra) | select | list }}"
openhpc_munge_key: "{{ vault_openhpc_mungekey | b64decode }}"
openhpc_login_only_nodes: login
openhpc_config_default:
Expand Down