Fix Ansible tags usage, use import_tasks

2018-07-13 11:49:20 +02:00
parent b7b9a27766
commit 44af318726
8 changed files with 18 additions and 22 deletions
--- 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']
--- 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']
--- 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']
--- a/roles/common
+++ b/roles/common
--- 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 ]
--- 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}}"
--- 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
--- 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 ]