downloads: split file and containers (#13581)

Splits the definitions into two dicts, while joining then for now to
preserve the downloads dict.

Update all consumers of the variables, which are roughly:
- manual includes of the download role (which will be removed in the
  short future)
- install tasks using the resolved 'dest' to find the artefacts

This will make further division of the downloads role easier.

roles/container-engine/containerd/tasks/main.yml

@@ -2,11 +2,11 @@
 - name: Containerd | Download containerd
   include_tasks: "../../../download/tasks/download_file.yml"
   vars:
-    download: "{{ download_defaults | combine(downloads.containerd) }}"
+    download: "{{ download_defaults | combine(downloads_file.containerd) }}"
 
 - name: Containerd | Unpack containerd archive
   unarchive:
-    src: "{{ downloads.containerd.dest }}"
+    src: "{{ downloads_file.containerd.dest }}"
     dest: "{{ containerd_bin_dir }}"
     mode: "0755"
     remote_src: true

roles/container-engine/cri-dockerd/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Runc | Download cri-dockerd binary
   include_tasks: "../../../download/tasks/download_file.yml"
   vars:
-    download: "{{ download_defaults | combine(downloads.cri_dockerd) }}"
+    download: "{{ download_defaults | combine(downloads_file.cri_dockerd) }}"
 
 - name: Copy cri-dockerd binary from download dir
   copy:

roles/container-engine/cri-o/tasks/main.yaml

@@ -24,7 +24,7 @@
 - name: Cri-o | Download cri-o
   include_tasks: "../../../download/tasks/download_file.yml"
   vars:
-    download: "{{ download_defaults | combine(downloads.crio) }}"
+    download: "{{ download_defaults | combine(downloads_file.crio) }}"
 
 - name: Cri-o | special handling for amazon linux
   import_tasks: "setup-amazon.yaml"

roles/container-engine/crictl/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Crictl | Download crictl
   include_tasks: "../../../download/tasks/download_file.yml"
   vars:
-    download: "{{ download_defaults | combine(downloads.crictl) }}"
+    download: "{{ download_defaults | combine(downloads_file.crictl) }}"
 
 - name: Install crictl config
   template:

roles/container-engine/crun/tasks/main.yml

@@ -2,11 +2,11 @@
 - name: Crun | Download crun binary
   include_tasks: "../../../download/tasks/download_file.yml"
   vars:
-    download: "{{ download_defaults | combine(downloads.crun) }}"
+    download: "{{ download_defaults | combine(downloads_file.crun) }}"
 
 - name: Copy crun binary from download dir
   copy:
-    src: "{{ downloads.crun.dest }}"
+    src: "{{ downloads_file.crun.dest }}"
     dest: "{{ bin_dir }}/crun"
     mode: "0755"
     remote_src: true

roles/container-engine/gvisor/tasks/main.yml

@@ -2,12 +2,12 @@
 - name: GVisor | Download runsc binary
   include_tasks: "../../../download/tasks/download_file.yml"
   vars:
-    download: "{{ download_defaults | combine(downloads.gvisor_runsc) }}"
+    download: "{{ download_defaults | combine(downloads_file.gvisor_runsc) }}"
 
 - name: GVisor | Download containerd-shim-runsc-v1 binary
   include_tasks: "../../../download/tasks/download_file.yml"
   vars:
-    download: "{{ download_defaults | combine(downloads.gvisor_containerd_shim) }}"
+    download: "{{ download_defaults | combine(downloads_file.gvisor_containerd_shim) }}"
 
 - name: GVisor | Copy binaries
   copy:
@@ -16,5 +16,5 @@
     mode: "0755"
     remote_src: true
   with_items:
-    - { src: "{{ downloads.gvisor_runsc.dest }}", dest: "runsc" }
-    - { src: "{{ downloads.gvisor_containerd_shim.dest }}", dest: "containerd-shim-runsc-v1" }
+    - { src: "{{ downloads_file.gvisor_runsc.dest }}", dest: "runsc" }
+    - { src: "{{ downloads_file.gvisor_containerd_shim.dest }}", dest: "containerd-shim-runsc-v1" }

roles/container-engine/kata-containers/tasks/main.yml

@@ -2,11 +2,11 @@
 - name: Kata-containers | Download kata binary
   include_tasks: "../../../download/tasks/download_file.yml"
   vars:
-    download: "{{ download_defaults | combine(downloads.kata_containers) }}"
+    download: "{{ download_defaults | combine(downloads_file.kata_containers) }}"
 
 - name: Kata-containers | Copy kata-containers binary
   unarchive:
-    src: "{{ downloads.kata_containers.dest }}"
+    src: "{{ downloads_file.kata_containers.dest }}"
     dest: "/"
     mode: "0755"
     owner: root

roles/container-engine/molecule/prepare.yml

@@ -16,7 +16,7 @@
     - name: Download CNI
       include_tasks: "../../download/tasks/download_file.yml"
       vars:
-        download: "{{ download_defaults | combine(downloads.cni) }}"
+        download: "{{ download_defaults | combine(downloads_file.cni) }}"
 
 - name: Prepare CNI
   hosts: all

roles/container-engine/nerdctl/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Nerdctl | Download nerdctl
   include_tasks: "../../../download/tasks/download_file.yml"
   vars:
-    download: "{{ download_defaults | combine(downloads.nerdctl) }}"
+    download: "{{ download_defaults | combine(downloads_file.nerdctl) }}"
 
 - name: Nerdctl | Copy nerdctl binary from download dir
   copy:

roles/container-engine/runc/tasks/main.yml

@@ -30,11 +30,11 @@
 - name: Runc | Download runc binary
   include_tasks: "../../../download/tasks/download_file.yml"
   vars:
-    download: "{{ download_defaults | combine(downloads.runc) }}"
+    download: "{{ download_defaults | combine(downloads_file.runc) }}"
 
 - name: Copy runc binary from download dir
   copy:
-    src: "{{ downloads.runc.dest }}"
+    src: "{{ downloads_file.runc.dest }}"
     dest: "{{ runc_bin_dir }}/runc"
     mode: "0755"
     remote_src: true

roles/container-engine/skopeo/tasks/main.yml

@@ -22,11 +22,11 @@
 - name: Skopeo | Download skopeo binary
   include_tasks: "../../../download/tasks/download_file.yml"
   vars:
-    download: "{{ download_defaults | combine(downloads.skopeo) }}"
+    download: "{{ download_defaults | combine(downloads_file.skopeo) }}"
 
 - name: Copy skopeo binary from download dir
   copy:
-    src: "{{ downloads.skopeo.dest }}"
+    src: "{{ downloads_file.skopeo.dest }}"
     dest: "{{ bin_dir }}/skopeo"
     mode: "0755"
     remote_src: true

roles/container-engine/youki/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Youki | Download youki
   include_tasks: "../../../download/tasks/download_file.yml"
   vars:
-    download: "{{ download_defaults | combine(downloads.youki) }}"
+    download: "{{ download_defaults | combine(downloads_file.youki) }}"
 
 - name: Youki | Copy youki binary from download dir
   copy: