From 207c7c2f71380ecbb950052714641d33457ad066 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Tue, 11 Oct 2022 20:36:59 -0400 Subject: [PATCH] Switch all includes to import_tasks. --- ansible/roles/per_user/tasks/main.yml | 4 ++-- ansible/roles/sudo/tasks/main.yaml | 4 ++-- ansible/roles/zrepl/tasks/common.yaml | 4 ++-- ansible/roles/zrepl/tasks/main.yaml | 2 +- ansible/roles/zsh/tasks/main.yaml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ansible/roles/per_user/tasks/main.yml b/ansible/roles/per_user/tasks/main.yml index b6e38a1..bb875d6 100644 --- a/ansible/roles/per_user/tasks/main.yml +++ b/ansible/roles/per_user/tasks/main.yml @@ -26,8 +26,8 @@ loop: - .ansible_deploy -- include: tasks/peruser_freebsd.yaml +- import_tasks: tasks/peruser_freebsd.yaml when: 'os_flavor == "freebsd"' -- include: tasks/peruser_linux.yaml +- import_tasks: tasks/peruser_linux.yaml when: 'os_flavor == "linux"' diff --git a/ansible/roles/sudo/tasks/main.yaml b/ansible/roles/sudo/tasks/main.yaml index 21b33aa..d956446 100644 --- a/ansible/roles/sudo/tasks/main.yaml +++ b/ansible/roles/sudo/tasks/main.yaml @@ -4,8 +4,8 @@ - sudo state: present -- include: tasks/freebsd.yaml +- import_tasks: tasks/freebsd.yaml when: 'os_flavor == "freebsd"' -- include: tasks/linux.yaml +- import_tasks: tasks/linux.yaml when: 'os_flavor == "linux"' diff --git a/ansible/roles/zrepl/tasks/common.yaml b/ansible/roles/zrepl/tasks/common.yaml index 15281dd..433c7ad 100644 --- a/ansible/roles/zrepl/tasks/common.yaml +++ b/ansible/roles/zrepl/tasks/common.yaml @@ -24,8 +24,8 @@ validate: "zrepl configcheck --config %s" notify: "restart zrepl" -- include: tasks/freebsd.yaml +- import_tasks: tasks/freebsd.yaml when: 'os_flavor == "freebsd"' -- include: tasks/linux.yaml +- import_tasks: tasks/linux.yaml when: 'os_flavor == "linux"' diff --git a/ansible/roles/zrepl/tasks/main.yaml b/ansible/roles/zrepl/tasks/main.yaml index 459f178..28ff5b6 100644 --- a/ansible/roles/zrepl/tasks/main.yaml +++ b/ansible/roles/zrepl/tasks/main.yaml @@ -1,2 +1,2 @@ -- include: tasks/common.yaml +- import_tasks: tasks/common.yaml when: zfs_snapshot_datasets is defined diff --git a/ansible/roles/zsh/tasks/main.yaml b/ansible/roles/zsh/tasks/main.yaml index d320bc8..c4f2d20 100644 --- a/ansible/roles/zsh/tasks/main.yaml +++ b/ansible/roles/zsh/tasks/main.yaml @@ -1,5 +1,5 @@ -- include: tasks/freebsd.yaml +- import_tasks: tasks/freebsd.yaml when: 'os_flavor == "freebsd"' -- include: tasks/linux.yaml +- import_tasks: tasks/linux.yaml when: 'os_flavor == "linux"'