Skip to content

Commit

Permalink
Empty commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
aybarsm committed Jun 27, 2024
1 parent 3c5b9d8 commit f42b44d
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 9 deletions.
2 changes: 1 addition & 1 deletion roles/grub/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ linux_grub_host: []
# linux_grub_host > linux_grub_group > linux_grub_default
linux_grub_all: "{{ [linux_grub_default, linux_grub_group, linux_grub_host] |
community.general.lists_mergeby('name', recursive=true, list_merge='prepend') |
aybarsm.helper.unique_recursive(attribute='name', recurse='value') }}"
aybarsm.helper.unique_recursive(attributes='name', recurse='value') }}"
2 changes: 1 addition & 1 deletion roles/network_interfaces/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ linux_network_interfaces_host: []
linux_network_interfaces_all: "{{
[linux_network_interfaces_default, linux_network_interfaces_group, linux_network_interfaces_host] |
community.general.lists_mergeby('name', recursive=true, list_merge='prepend') |
aybarsm.helper.unique_recursive(attribute='name', recurse='inet') | aybarsm.helper.unique_recursive(attribute='name', recurse='inet6') }}"
aybarsm.helper.unique_recursive(attributes='name', recurse='inet') | aybarsm.helper.unique_recursive(attributes='name', recurse='inet6') }}"

# linux_network_interfaces_default:
# - name: enp0s6
Expand Down
5 changes: 0 additions & 5 deletions roles/package_manager/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,3 @@ linux_package_manager_default: []
linux_package_manager_group: []
linux_package_manager_host: []
linux_package_manager_all: "{{ (linux_package_manager_default + linux_package_manager_group + linux_package_manager_host) | selectattr('type', 'defined') }}"

linux_package_manager_packages_all: "{{ linux_package_manager_all | selectattr('type', 'equalto', 'package') |
selectattr('name', 'defined') | unique(attribute='name') | default([]) }}"
linux_package_manager_repos_all: "{{ linux_package_manager_all | selectattr('type', 'equalto', 'repo') |
selectattr('repo', 'defined') | unique(attribute='repo') | default([]) }}"
6 changes: 4 additions & 2 deletions roles/package_manager/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
---
- name: Load OS related variables
ansible.builtin.include_vars:
file: "{{ ansible_facts['os_family'] | lower }}.yml"
ansible.builtin.include_vars: "{{ ansible_facts['os_family'] | lower }}.yml"

- name: Load common variables structured on OS related variables
ansible.builtin.include_vars: common.yml

- name: Import APT package manager tasks
ansible.builtin.import_tasks:
Expand Down
9 changes: 9 additions & 0 deletions roles/package_manager/vars/common.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
linux_package_manager_packages_all: "{{ linux_package_manager_all | selectattr('type', 'equalto', 'package') |
aybarsm.helper.selectattr_defined(attributes=__linux_package_manager_uniques_package, logic='or') |
aybarsm.helper.unique_recursive(attributes=__linux_package_manager_uniques_package) | default([]) }}"
linux_package_manager_repos_all: "{{ linux_package_manager_all | selectattr('type', 'equalto', 'repo') |
aybarsm.helper.selectattr_defined(attributes=__linux_package_manager_uniques_repo, logic='or') |
aybarsm.helper.unique_recursive(attributes=__linux_package_manager_uniques_repo) | default([]) }}"
linux_package_manager_repo_keys_all: "{{ linux_package_manager_all | selectattr('type', 'equalto', 'repo_key') |
aybarsm.helper.selectattr_defined(attributes=__linux_package_manager_uniques_repo_key, logic='or') |
aybarsm.helper.unique_recursive(attributes=__linux_package_manager_uniques_repo_key) | default([]) }}"
3 changes: 3 additions & 0 deletions roles/package_manager/vars/debian.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
__linux_package_manager_uniques_package: ['name']
__linux_package_manager_uniques_repo: ['repo']
__linux_package_manager_uniques_repo_key: ['keyserver', 'url', 'id', 'data', 'file']

0 comments on commit f42b44d

Please sign in to comment.