Fixes and improvements for package installation during image builds

src/ansible/roles/facts/tasks/main.yml

@@ -1,6 +1,2 @@
-- name: 'Include distribution specific tasks [{{ ansible_distribution }} {{ ansible_distribution_major_version }}]'
-  include_tasks: '{{ include_file }}'
-  loop_control:
-    loop_var: include_file
-  with_first_found:
-  - files: '{{ ansible_distribution | distro_includes(ansible_distribution_major_version) }}'
+- name: 'Include distribution specific tasks [{{ ansible_distribution }}]'
+  include_tasks: '{{ ansible_distribution }}.yml'

src/ansible/roles/packages/tasks/main.yml

@@ -1,9 +1,5 @@
-- name: 'Include distribution specific package tasks [{{ ansible_distribution }} {{ ansible_distribution_major_version }}]'
-  include_tasks: '{{ include_file }}'
-  loop_control:
-    loop_var: include_file
-  with_first_found:
-  - files: '{{ ansible_distribution | distro_includes(ansible_distribution_major_version) }}'
+- name: 'Include distribution specific package tasks [{{ ansible_distribution }}]'
+  include_tasks: '{{ ansible_distribution }}.yml'
 
 - name: 'Clear package manager cache'
   shell: |