diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2024-04-29 19:06:00 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2024-04-29 19:06:00 +0200 |
| commit | c5468f078230b1a52a8c4d6731cf57a0eb7cb6b3 (patch) | |
| tree | 8a8556563cbd3f901343361db69b31c218506f94 | |
| parent | update repo keyring for aptly (diff) | |
simplify base_packages_extra variables
| -rw-r--r-- | _graveyard_/inventory/host_vars/lw-dione.yml | 2 | ||||
| -rw-r--r-- | _graveyard_/inventory/host_vars/lw-helene.yml | 2 | ||||
| -rw-r--r-- | _graveyard_/inventory/host_vars/r3-cccamp19-dione.yml | 2 | ||||
| -rw-r--r-- | _graveyard_/inventory/host_vars/r3-cccamp19-helene.yml | 2 | ||||
| -rw-r--r-- | roles/core/base/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/core/base/tasks/Debian.yml | 2 | ||||
| -rw-r--r-- | roles/core/base/tasks/OpenBSD.yml | 2 |
7 files changed, 7 insertions, 8 deletions
diff --git a/_graveyard_/inventory/host_vars/lw-dione.yml b/_graveyard_/inventory/host_vars/lw-dione.yml index e5073987..57318a43 100644 --- a/_graveyard_/inventory/host_vars/lw-dione.yml +++ b/_graveyard_/inventory/host_vars/lw-dione.yml @@ -19,7 +19,7 @@ network: - *_network_primary_ -base_packages_extra_host: +base_packages_extra: - exfat-fuse - exfat-utils - vlan diff --git a/_graveyard_/inventory/host_vars/lw-helene.yml b/_graveyard_/inventory/host_vars/lw-helene.yml index a45f02d0..e30318e3 100644 --- a/_graveyard_/inventory/host_vars/lw-helene.yml +++ b/_graveyard_/inventory/host_vars/lw-helene.yml @@ -19,7 +19,7 @@ network: - *_network_primary_ -base_packages_extra_host: +base_packages_extra: - exfat-fuse - exfat-utils - vlan diff --git a/_graveyard_/inventory/host_vars/r3-cccamp19-dione.yml b/_graveyard_/inventory/host_vars/r3-cccamp19-dione.yml index 47195b1f..e4dd569c 100644 --- a/_graveyard_/inventory/host_vars/r3-cccamp19-dione.yml +++ b/_graveyard_/inventory/host_vars/r3-cccamp19-dione.yml @@ -11,7 +11,7 @@ network: domain: camp.realraum.at -base_packages_extra_host: +base_packages_extra: - vlan dyndns: diff --git a/_graveyard_/inventory/host_vars/r3-cccamp19-helene.yml b/_graveyard_/inventory/host_vars/r3-cccamp19-helene.yml index 104a5eda..5ffe8a7e 100644 --- a/_graveyard_/inventory/host_vars/r3-cccamp19-helene.yml +++ b/_graveyard_/inventory/host_vars/r3-cccamp19-helene.yml @@ -11,7 +11,7 @@ network: domain: camp.realraum.at -base_packages_extra_host: +base_packages_extra: - vlan dyndns: diff --git a/roles/core/base/defaults/main.yml b/roles/core/base/defaults/main.yml index 1668ce05..40a9b458 100644 --- a/roles/core/base/defaults/main.yml +++ b/roles/core/base/defaults/main.yml @@ -31,8 +31,7 @@ base_modules_blacklist_all_but_sound_and_fs: "{{ base_modules_blacklist_ | diffe base_modules_blacklist_none: [] base_modules_blacklist: "{{ base_modules_blacklist_full }}" -base_packages_extra_host: [] -base_packages_extra_group: [] +base_packages_extra: [] base_intel_nic_stability_fix: false diff --git a/roles/core/base/tasks/Debian.yml b/roles/core/base/tasks/Debian.yml index 73fa2420..9b40739b 100644 --- a/roles/core/base/tasks/Debian.yml +++ b/roles/core/base/tasks/Debian.yml @@ -54,7 +54,7 @@ - name: install extra packages apt: - name: "{{ base_packages_extra_host | union(base_packages_extra_group) }}" + name: "{{ base_packages_extra }}" state: present - name: install rngd diff --git a/roles/core/base/tasks/OpenBSD.yml b/roles/core/base/tasks/OpenBSD.yml index 81bde57f..fbc06379 100644 --- a/roles/core/base/tasks/OpenBSD.yml +++ b/roles/core/base/tasks/OpenBSD.yml @@ -11,5 +11,5 @@ - name: install extra packages openbsd_pkg: - name: "{{ base_packages_extra_host | union(base_packages_extra_group) }}" + name: "{{ base_packages_extra }}" state: present |