From bd49b1ee3ae80e144b5ae4b4df8c5ef79d010b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Sachse?= <Joerg.Sachse@slub-dresden.de> Date: Mon, 2 Aug 2021 09:01:02 +0200 Subject: [PATCH] chore: remove tags from individual tasks and use tag inheritance instead --- tasks/configure_nfs_mounts.yml | 6 ++---- tasks/create_users_groups.yml | 2 -- tasks/install_packages.yml | 2 -- tasks/main.yml | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/tasks/configure_nfs_mounts.yml b/tasks/configure_nfs_mounts.yml index 40afa64..20535f2 100644 --- a/tasks/configure_nfs_mounts.yml +++ b/tasks/configure_nfs_mounts.yml @@ -3,7 +3,6 @@ file: path: "{{ vault_nfs_mounts.log.mountpoint }}{{ ansible_hostname }}" state: directory - tags: [nfs] - name: NFS-Shares für Logging mounten (/var/log/rossanity/) mount: @@ -12,7 +11,7 @@ state: mounted fstype: "nfs" opts: "defaults,nodev,nosuid,rsize=8192,wsize=8192,vers=3" - tags: [nfs, notest] + tags: [notest] ### MOUNTPOINTS PERMANENT ERSTELLEN ### - name: Mountpoints für Permanent Storage anlegen @@ -23,7 +22,6 @@ - "{{ vault_nfs_mounts.permanent_dev.mountpoint }}" - "{{ vault_nfs_mounts.permanent_test.mountpoint }}" - "{{ vault_nfs_mounts.permanent_prod.mountpoint }}" - tags: [nfs] ### PERMANENT STORAGE MOUNTEN ### - name: NFS-Shares für Permanent Storage mounten @@ -41,4 +39,4 @@ # - name: "{{ vault_nfs_mounts.permanent_prod.mountpoint }}" # src: "{{ vault_nfs_mounts.permanent_prod.share }}" # opts: "auto,nfsvers=4" - tags: [nfs, notest] + tags: [notest] diff --git a/tasks/create_users_groups.yml b/tasks/create_users_groups.yml index 4546d4a..1807633 100644 --- a/tasks/create_users_groups.yml +++ b/tasks/create_users_groups.yml @@ -5,7 +5,6 @@ state: "{{ item.state | default('present') }}" gid: "{{ item.gid | default(omit) }}" loop: "{{ vault_groups }}" - tags: [users] - name: User in Gruppen einfügen & SSH-Key erzeugen user: @@ -14,4 +13,3 @@ generate_ssh_key: "yes" ssh_key_bits: 4096 ssh_key_comment: "lza-user" - tags: [users] diff --git a/tasks/install_packages.yml b/tasks/install_packages.yml index 568925c..adaced2 100644 --- a/tasks/install_packages.yml +++ b/tasks/install_packages.yml @@ -15,7 +15,6 @@ 'unzip', ] update_cache: "yes" - tags: [apt] - name: Install/Update Perl-Pakages for Exit apt: @@ -26,7 +25,6 @@ 'libtime-progress-perl', 'libxml-libxml-perl', ] - tags: [apt] - name: install Perl packages from CPAN cpanm: diff --git a/tasks/main.yml b/tasks/main.yml index 189f1fc..6c9feff 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -7,7 +7,7 @@ - name: install packages import_tasks: "install_packages.yml" - tags: [apt, packages] + tags: [apt, packages, cpan, cpanm] - name: create users and groups import_tasks: "create_users_groups.yml" -- GitLab