rolle: apt_install_packages umgebaut + Pakete entfernen eingebaut (#237)

Co-authored-by: Michael Grote <michael.grote@posteo.de>
Reviewed-on: mg/ansible#237
Co-authored-by: mg <michael.grote@posteo.de>
Co-committed-by: mg <michael.grote@posteo.de>

group_vars/all.yml

@@ -174,8 +174,8 @@
         - production
         - test
         - laptop
-  ### mgrote.apt_install_packages
-  programs_common:
+  ### mgrote.apt_manage_packages
+  apt_packages_common:
     - locales
     - python3
     - build-essential
@@ -203,16 +203,18 @@
     - rsync
     - at
     - ripgrep
-  programs_only_physical:
+  apt_packages_physical:
     - hddtemp
     - ipmitool
     - s-tui
     - smartmontools
     - lm-sensors
     - ethtool
-  programs_only_vms:
+  apt_packages_vm:
     - qemu-guest-agent
     - open-vm-tools
+  apt_packages_absent:
+    - nano
 
 
 

group_vars/ansible.yml

@@ -12,6 +12,6 @@
   ansible_install_version_pip: '2.10'
   ### mgrote.restic
   restic_folders_to_backup: "/usr/local /etc /root /home"
-  ### mgrote.apt_install_packages
-  programs_extra:
+  ### mgrote.apt_manage_packages
+  apt_packages_extra:
     - sshpass

group_vars/jenkins.yml

@@ -35,7 +35,7 @@
   ### geerlingguy.ansible
   ansible_install_method: pip
   ansible_install_version_pip: '2.10'
-  ### mgrote.apt_install_packages
-  programs_extra:
+  ### mgrote.apt_manage_packages
+  apt_packages_extra:
     - graphviz # für ansible-playbook-grapher
     - sshpass

group_vars/laptop.yml

@@ -31,8 +31,8 @@
     - path: /home/mg/.config/flameshot
 
   dotfiles_owner: mg
-  ### mgrote.apt_install_packages
-  programs_extra:
+  ### mgrote.apt_manage_packages
+  apt_packages_extra:
     - bmon
     - hddtemp
     - s-tui

group_vars/proxmox.yml

@@ -1,6 +1,6 @@
 ---
-  ### mgrote.apt_install_packages
-  programs_extra:
+  ### mgrote.apt_manage_packages
+  apt_packages_extra:
     - ifupdown2
     - bmon
   ### mgrote.smart

group_vars/proxmoxtest.yml

@@ -1,5 +1,5 @@
 ---
-  ### mgrote.apt_install_packages
-  programs_extra:
+  ### mgrote.apt_manage_packages
+  apt_packages_extra:
     - qemu-guest-agent
     - open-vm-tools

group_vars/tor.yml

@@ -80,8 +80,8 @@
   tmux_conf_destination: "/home/mg/.tmux.conf"
   tmux_bashrc_destination: "/home/mg/.bashrc"
   tmux_standardsession_name: "default"
-  ### mgrote.apt_install_packages
-  programs_extra:
+  ### mgrote.apt_manage_packages
+  apt_packages_extra:
     - python3-stem # für munin-tor_
     - geoip-bin # für munin-tor_
     - geoip-database # für munin-tor_

host_vars/docker2.grote.lan.yml

@@ -41,8 +41,8 @@
       protocol: tcp
       comment: 'munin'
       from_ip: 0.0.0.0/0
-  ### mgrote.apt_install_packages
-  programs_extra:
+  ### mgrote.apt_manage_packages
+  apt_packages_extra:
     - libwww-curl-perl # für munin-plugin: unifi
     - libjson-perl # für munin-plugin: unifi
   ### mgrote.munin-node

playbooks/2_all.yml

@@ -1,6 +1,6 @@
 ---
   - import_playbook: base/apt_sources.yml
-  - import_playbook: base/install_packages.yml
+  - import_playbook: base/packages.yml
   - import_playbook: base/ntp_client.yml
   - import_playbook: base/restic.yml
   - import_playbook: base/users.yml

playbooks/base/install_packages.yml

@@ -1,5 +0,0 @@
----
-  - hosts: all
-    serial: 3
-    roles:
-      - { role: mgrote.apt_install_packages, tags: "install"}

playbooks/base/packages.yml

@@ -0,0 +1,5 @@
+---
+  - hosts: all
+    serial: 3
+    roles:
+      - { role: mgrote.apt_manage_packages, tags: "install"}

roles/mgrote.apt_manage_packages/README.md

@@ -1,20 +1,20 @@
-## mgrote.apt_install_packages
+## mgrote.apt_manage_packages
 
 ### Beschreibung
 Fuehrt:
 `apt install {{ programme }}`
 aus.
 ```yaml
-  programs_common:
+  apt_packages_common:
     - locales
     - wird überall installiert
-  programs_only_physical:
+  apt_packages_physical:
     - hddtemp
     - nur auf Hardware-Maschinen
-  programs_only_vms:
+  apt_packages_vm:
     - qemu-guest-agent
     - nur in VMs
-  programs_extra:
+  apt_packages_extra:
     - Extra-Parameter für einzelne Hosts
 ```
 Es wird unterschieden ob das Ziel eine VM ist oder nicht.

roles/mgrote.apt_manage_packages/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-  programs_common:
+  apt_packages_common:
     - locales
     - build-essential
     - ntp
@@ -22,12 +22,13 @@
     - acl
     - python3
     - vim
-  programs_only_physical:
+  apt_packages_physical:
     - hddtemp
     - ipmitool
     - powertop
     - s-tui
-  programs_only_vms:
+  apt_packages_vm:
     - qemu-guest-agent
     - open-vm-tools
-  programs_extra:
+  apt_packages_extra:
+  apt_packages_absent:

roles/mgrote.apt_manage_packages/tasks/main.yml

@@ -2,26 +2,32 @@
   - name: install common-packages
     become: yes
     ansible.builtin.package:
-      name: "{{ programs_common }}"
+      name: "{{ apt_packages_common }}"
       state: present
 
   - name: install extra-packages
     become: yes
     ansible.builtin.package:
-      name: "{{ programs_extra }}"
+      name: "{{ apt_packages_extra }}"
       state: present
-    when:  programs_extra is defined
+    when:  apt_packages_extra is defined
 
   - name: install vm-packages
     become: yes
     ansible.builtin.package:
-      name: "{{ programs_only_vms }}"
+      name: "{{ apt_packages_vm }}"
       state: present
     when: ansible_virtualization_role == 'guest'
 
   - name: install physical-packages
     become: yes
     ansible.builtin.package:
-      name: "{{ programs_only_physical }}"
+      name: "{{ apt_packages_physical }}"
       state: present
     when: ansible_virtualization_role != 'guest'
+
+  - name: remove packages
+    become: yes
+    ansible.builtin.package:
+      name: "{{ apt_packages_absent }}"
+      state: absent