From 44af318726c22061318e805facd3f0eb44892874 Mon Sep 17 00:00:00 2001 From: "Daniel A. Maierhofer" Date: Fri, 13 Jul 2018 11:49:20 +0200 Subject: [PATCH] Fix Ansible tags usage, use import_tasks --- roles/ariane/tasks/main.yml | 18 +++++++++--------- roles/backup/tasks/main.yml | 2 +- roles/backupclient/tasks/main.yml | 2 +- roles/common | 2 +- roles/gitea/tasks/main.yml | 2 +- roles/ruby_sites/tasks/main.yml | 3 +-- roles/testuser/tasks/main.yml | 9 +++------ roles/ups/tasks/main.yml | 2 +- 8 files changed, 18 insertions(+), 22 deletions(-) diff --git a/roles/ariane/tasks/main.yml b/roles/ariane/tasks/main.yml index 01ba6fe..9e7467f 100644 --- a/roles/ariane/tasks/main.yml +++ b/roles/ariane/tasks/main.yml @@ -1,36 +1,36 @@ --- -- include_tasks: git.yml +- import_tasks: git.yml when: ariane_git tags: ['ariane_git', 'git'] -- include_tasks: sysctl.yml +- import_tasks: sysctl.yml when: ariane_sysctl tags: ['ariane_sysctl', 'sysctl'] -- include_tasks: logrotate.yml +- import_tasks: logrotate.yml when: ariane_logrotate tags: ['ariane_logrotate', 'logrotate'] -- include_tasks: iptables.yml +- import_tasks: iptables.yml when: ariane_iptables tags: ['ariane_iptables', 'iptables'] -- include_tasks: zfs.yml +- import_tasks: zfs.yml when: ariane_zfs tags: ['ariane_zfs', 'zfs'] -- include_tasks: lxc.yml +- import_tasks: lxc.yml when: ariane_lxc tags: ['ariane_lxc', 'lxc'] -- include_tasks: lxc_void.yml +- import_tasks: lxc_void.yml when: ariane_lxc_void tags: ['ariane_lxc_void', 'lxc', 'lxc_void'] -- include_tasks: snapper.yml +- import_tasks: snapper.yml when: ariane_snapper tags: ['ariane_snapper', 'snapper'] -- include_tasks: smartd.yml +- import_tasks: smartd.yml when: ariane_smartd tags: ['ariane_smartd', 'smartd'] diff --git a/roles/backup/tasks/main.yml b/roles/backup/tasks/main.yml index 8da6499..83441d1 100644 --- a/roles/backup/tasks/main.yml +++ b/roles/backup/tasks/main.yml @@ -1,4 +1,4 @@ --- -- include_tasks: borg.yml +- import_tasks: borg.yml when: backup_borg tags: ['backup', 'borg'] diff --git a/roles/backupclient/tasks/main.yml b/roles/backupclient/tasks/main.yml index 8da6499..83441d1 100644 --- a/roles/backupclient/tasks/main.yml +++ b/roles/backupclient/tasks/main.yml @@ -1,4 +1,4 @@ --- -- include_tasks: borg.yml +- import_tasks: borg.yml when: backup_borg tags: ['backup', 'borg'] diff --git a/roles/common b/roles/common index 45276ec..bde0261 160000 --- a/roles/common +++ b/roles/common @@ -1 +1 @@ -Subproject commit 45276ec01eee736706c268561fe5a490c101598c +Subproject commit bde0261bab613c36b9ed981f93729a6240e7c4fa diff --git a/roles/gitea/tasks/main.yml b/roles/gitea/tasks/main.yml index e5bc604..a892bb6 100644 --- a/roles/gitea/tasks/main.yml +++ b/roles/gitea/tasks/main.yml @@ -1,3 +1,3 @@ --- -- include_tasks: gitea.yml +- import_tasks: gitea.yml tags: [ gitea ] diff --git a/roles/ruby_sites/tasks/main.yml b/roles/ruby_sites/tasks/main.yml index c445d28..d1ad92d 100644 --- a/roles/ruby_sites/tasks/main.yml +++ b/roles/ruby_sites/tasks/main.yml @@ -1,5 +1,4 @@ --- - name: "deploying ruby sites" - include_tasks: site.yml + import_tasks: site.yml with_items: "{{ruby_sites}}" - \ No newline at end of file diff --git a/roles/testuser/tasks/main.yml b/roles/testuser/tasks/main.yml index 1f717f2..8e20212 100644 --- a/roles/testuser/tasks/main.yml +++ b/roles/testuser/tasks/main.yml @@ -1,13 +1,10 @@ --- - - command: whoami - register: whoami + register: whoami changed_when: false become_user: ruby - - debug: msg="{{ whoami.stdout }}" - -- name: Stuff - include_tasks: stuff.yml +- name: Stuff + import_tasks: stuff.yml diff --git a/roles/ups/tasks/main.yml b/roles/ups/tasks/main.yml index cdb89c4..adb5977 100644 --- a/roles/ups/tasks/main.yml +++ b/roles/ups/tasks/main.yml @@ -1,3 +1,3 @@ --- -- include_tasks: nut.yml +- import_tasks: nut.yml tags: [ nut ]