瀏覽代碼

Switch include to include_tasks

Resolves latest ansible deprecation errors
Antony Messerli 3 年之前
父節點
當前提交
8478519621
共有 2 個文件被更改,包括 12 次插入12 次删除
  1. 7 7
      roles/netbootxyz/tasks/generate_disks.yml
  2. 5 5
      roles/netbootxyz/tasks/main.yml

+ 7 - 7
roles/netbootxyz/tasks/generate_disks.yml

@@ -1,29 +1,29 @@
 ---
 
-  - include: generate_disks_base.yml
+  - include_tasks: generate_disks_base.yml
 
-  - include: generate_disks_legacy.yml
+  - include_tasks: generate_disks_legacy.yml
     when:
     - generate_disks_legacy | default(true) | bool
 
-  - include: generate_disks_linux.yml
+  - include_tasks: generate_disks_linux.yml
     when:
     - generate_disks_linux | default(false) | bool
 
-  - include: generate_disks_efi.yml
+  - include_tasks: generate_disks_efi.yml
     when:
     - generate_disks_efi | default(true) | bool
 
-  - include: generate_disks_arm.yml
+  - include_tasks: generate_disks_arm.yml
     when:
     - generate_disks_arm | default(false) | bool
 
-  - include: generate_disks_rpi.yml
+  - include_tasks: generate_disks_rpi.yml
     when:
     - generate_disks_rpi | default(false) | bool
     - bootloader_filename == "netboot.xyz"
 
-  - include: generate_disks_hybrid.yml
+  - include_tasks: generate_disks_hybrid.yml
     when:
     - generate_disks_hybrid | default(false) | bool
     - generate_disks_legacy | default(true) | bool

+ 5 - 5
roles/netbootxyz/tasks/main.yml

@@ -1,13 +1,13 @@
 ---
-  - include: generate_menus.yml
+  - include_tasks: generate_menus.yml
     when:
     - generate_menus | default(true) | bool
 
-  - include: generate_menus_custom.yml
+  - include_tasks: generate_menus_custom.yml
     when:
     - custom_generate_menus | default(false) | bool
 
-  - include: generate_disks.yml
+  - include_tasks: generate_disks.yml
     with_items:
     - "{{ bootloader_disks }}"
     loop_control:
@@ -15,10 +15,10 @@
     when:
     - generate_disks | default(true) | bool
 
-  - include: generate_checksums.yml
+  - include_tasks: generate_checksums.yml
     when:
     - generate_checksums | default(true) | bool
 
-  - include: generate_signatures.yml
+  - include_tasks: generate_signatures.yml
     when:
     - generate_signatures | default(false) | bool