From e4bdc73c4c9116c06bdf9ca903654c72dab71044 Mon Sep 17 00:00:00 2001 From: L3D Date: Mon, 31 Jul 2023 23:12:00 +0200 Subject: [PATCH] New role l3d.packages --- .gitmodules | 7 +++---- collections/ansible_collections/community/general | 2 +- group_vars/all.yml | 7 +++++++ roles/do1jlr.base | 1 - roles/l3d.packages | 1 + site.yml | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) delete mode 160000 roles/do1jlr.base create mode 160000 roles/l3d.packages diff --git a/.gitmodules b/.gitmodules index bf0e106..996bf3a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -62,10 +62,6 @@ path = roles/ansible_version url = https://github.com/chaos-bodensee/role-ansible_version.git branch = main -[submodule "roles/base"] - path = roles/do1jlr.base - url = https://github.com/roles-ansible/ansible_role_base.git - branch = main [submodule "roles/amdgpu_firmware"] path = roles/amdgpu_firmware url = https://github.com/DO1JLR/ansible_role_amdgpu_firmware.git @@ -91,3 +87,6 @@ [submodule "collections/ansible_collections/l3d/avahi"] path = collections/ansible_collections/l3d/avahi url = https://github.com/roles-ansible/ansible_collection_avahi.git +[submodule "roles/l3d.packages"] + path = roles/l3d.packages + url = https://github.com/roles-ansible/ansible_role_packages.git diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general index 4b382ed..a942545 160000 --- a/collections/ansible_collections/community/general +++ b/collections/ansible_collections/community/general @@ -1 +1 @@ -Subproject commit 4b382ed1df8d3e8f9add8cb474acb625321301b9 +Subproject commit a942545dd2ec718993f95db35ac3e988d24e73a5 diff --git a/group_vars/all.yml b/group_vars/all.yml index 29d1e9d..635aa9c 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -70,5 +70,12 @@ i3_run_on_startup: htop__compile: true +# roles/do1jlr.base +l3d_pkgs__install_advanced: true +l3d_pkgs__install_python: true +l3d_pkgs__install_cli: true +l3d_pkgs__install_extra_packages: + - keychain + # globaly enably simple versionscheck - if available submodules_versioncheck: true diff --git a/roles/do1jlr.base b/roles/do1jlr.base deleted file mode 160000 index b0c817c..0000000 --- a/roles/do1jlr.base +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b0c817c68105a5e4ca12a695e18e117918ba8e42 diff --git a/roles/l3d.packages b/roles/l3d.packages new file mode 160000 index 0000000..aa14284 --- /dev/null +++ b/roles/l3d.packages @@ -0,0 +1 @@ +Subproject commit aa14284301b5a24cd4e0e1ed6ef95d62c7c567db diff --git a/site.yml b/site.yml index 3f5cfe5..dc9d7b6 100644 --- a/site.yml +++ b/site.yml @@ -7,7 +7,7 @@ - name: Generic Workstation Preperation hosts: all roles: - # - {role: do1jlr.base, tags: [default, packages, base]} + - {role: l3d.packages, tags: [packages, apt]} # - {role: workstation_packages, tags: [default, workstation_packages, packages, setup]} - {role: l3d.ntp, tags: ntp} - {role: l3d.avahi.client, tags: avahi}