talexander/machine_setup
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Switch all includes to import_tasks.

Browse Source
This commit is contained in:
Tom Alexander 2022-10-11 20:36:59 -04:00
parent 238885db9a
commit 207c7c2f71
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/per_user/tasks/main.yml
View File

@ -26,8 +26,8 @@
loop: loop:
- .ansible_deploy - .ansible_deploy
- include: tasks/peruser_freebsd.yaml - import_tasks: tasks/peruser_freebsd.yaml
when: 'os_flavor == "freebsd"' when: 'os_flavor == "freebsd"'
- include: tasks/peruser_linux.yaml - import_tasks: tasks/peruser_linux.yaml
when: 'os_flavor == "linux"' when: 'os_flavor == "linux"'

4
ansible/roles/sudo/tasks/main.yaml
View File

@ -4,8 +4,8 @@
- sudo - sudo
state: present state: present
- include: tasks/freebsd.yaml - import_tasks: tasks/freebsd.yaml
when: 'os_flavor == "freebsd"' when: 'os_flavor == "freebsd"'
- include: tasks/linux.yaml - import_tasks: tasks/linux.yaml
when: 'os_flavor == "linux"' when: 'os_flavor == "linux"'

4
ansible/roles/zrepl/tasks/common.yaml
View File

@ -24,8 +24,8 @@
validate: "zrepl configcheck --config %s" validate: "zrepl configcheck --config %s"
notify: "restart zrepl" notify: "restart zrepl"
- include: tasks/freebsd.yaml - import_tasks: tasks/freebsd.yaml
when: 'os_flavor == "freebsd"' when: 'os_flavor == "freebsd"'
- include: tasks/linux.yaml - import_tasks: tasks/linux.yaml
when: 'os_flavor == "linux"' when: 'os_flavor == "linux"'

2
ansible/roles/zrepl/tasks/main.yaml
View File

@ -1,2 +1,2 @@
- include: tasks/common.yaml - import_tasks: tasks/common.yaml
when: zfs_snapshot_datasets is defined when: zfs_snapshot_datasets is defined

4
ansible/roles/zsh/tasks/main.yaml
View File

@ -1,5 +1,5 @@
- include: tasks/freebsd.yaml - import_tasks: tasks/freebsd.yaml
when: 'os_flavor == "freebsd"' when: 'os_flavor == "freebsd"'
- include: tasks/linux.yaml - import_tasks: tasks/linux.yaml
when: 'os_flavor == "linux"' when: 'os_flavor == "linux"'