From eb56446f0fa13395daab2be889efcfd68339ee4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Sachse?= <Joerg.Sachse@slub-dresden.de> Date: Fri, 5 Mar 2021 10:25:20 +0100 Subject: [PATCH] fix: remove redundant task-specific tags and use inheritance instead --- tasks/configure-nfs-mounts.yml | 5 +---- tasks/configure-systemd-services.yml | 4 ---- tasks/create-users-groups.yml | 2 -- tasks/install-packages.yml | 2 -- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/tasks/configure-nfs-mounts.yml b/tasks/configure-nfs-mounts.yml index 78b2094..bf371a3 100644 --- a/tasks/configure-nfs-mounts.yml +++ b/tasks/configure-nfs-mounts.yml @@ -4,13 +4,11 @@ path: "{{ item.name }}" loop: "{{ vault_nfs_mounts | flatten(levels=1) }}" register: missing_mountpoints - tags: [nfs] - debug: # var: missing_mountpoints msg: "{{ item }}" loop: "{{ missing_mountpoints.results | flatten(levels=1) }}" - tags: [nfs] - name: create missing mountpoints so Molecule tests don't fail file: @@ -21,7 +19,6 @@ state: directory loop: "{{ missing_mountpoints.results | flatten(levels=1) }}" when: not item.stat.exists - tags: [nfs] - name: NFS-Shares mounten mount: @@ -31,4 +28,4 @@ fstype: nfs opts: "{{ item.opts | default('defaults,nodev,nosuid,rsize=65536,wsize=65536,vers=3') }}" loop: "{{ vault_nfs_mounts | flatten(levels=1) }}" - tags: [nfs, molecule-notest] + tags: [molecule-notest] diff --git a/tasks/configure-systemd-services.yml b/tasks/configure-systemd-services.yml index 73f5676..75a8832 100644 --- a/tasks/configure-systemd-services.yml +++ b/tasks/configure-systemd-services.yml @@ -3,7 +3,6 @@ file: path: "/etc/systemd/user/" state: directory - tags: [systemd] - name: Systemd-Unitfiles installieren template: @@ -16,13 +15,11 @@ notify: - systemctl daemon-reload register: unitfiles_result - tags: [systemd] - name: Systemd-Units enablen command: "systemctl enable /etc/systemd/user/{{ item.key }}.service" # noqa 301 303 with_dict: "{{ vault_service_files }}" when: unitfiles_result.changed - tags: [systemd] - name: SystemD-Units starten systemd: @@ -30,4 +27,3 @@ state: restarted with_dict: "{{ vault_service_files }}" when: unitfiles_result.changed - tags: [systemd] diff --git a/tasks/create-users-groups.yml b/tasks/create-users-groups.yml index 058a3f7..f6b00ac 100644 --- a/tasks/create-users-groups.yml +++ b/tasks/create-users-groups.yml @@ -4,7 +4,6 @@ name: "{{ item.name }}" gid: "{{ item.gid }}" loop: "{{ vault_groups | flatten(levels=1) }}" - tags: [users] - name: User in Gruppen einfügen und primäre Gruppe setzen user: @@ -12,4 +11,3 @@ group: "{{ item.group }}" groups: "{{ item.groups }}" loop: "{{ vault_users | flatten(levels=1) }}" - tags: [users] diff --git a/tasks/install-packages.yml b/tasks/install-packages.yml index 579c915..7ab29dc 100644 --- a/tasks/install-packages.yml +++ b/tasks/install-packages.yml @@ -3,7 +3,6 @@ - name: apt-get update apt: update_cache: "yes" - tags: [apt] - name: Install/Update Debian packages apt: @@ -22,4 +21,3 @@ 'tar', 'unzip' ] - tags: [apt] -- GitLab