update..

roles/common/tasks/apt.yml

@@ -96,12 +96,17 @@
   tags:
     - apt-initial-install
 
-- name: (apt.yml) Ensure we have CPU microcode from backports (debian stretch)
+# ---
+# Microcode
+# ---
+
+- name: (apt.yml) Ensure we have CPU microcode from backports for Intel CPU (debian stretch)
   apt:
-    name: "{{ microcode_package }}"
+    name: "{{ microcode_intel_package }}"
     state: present
     default_release: "{{ ansible_distribution_release }}-backports"
   when:
+    - apt_backports_enable
     - ansible_facts['distribution'] == "Debian"
     - ansible_facts['distribution_major_version'] == "9"
     - ansible_facts['processor']|string is search("Intel")
@@ -109,9 +114,24 @@
     - apt-initial-install
     - apt-microcode
 
-- name: (apt.yml) Install CPU microcode (debian buster)
+- name: (apt.yml) Ensure we have CPU microcode from backports for AMD CPU (debian stretch)
   apt:
-    name: "{{ microcode_package }}"
+    name: "{{ microcode_amd_package }}"
+    state: present
+    default_release: "{{ ansible_distribution_release }}-backports"
+  when:
+    - apt_backports_enable
+    - apt_debian_contrib_nonfree_enable
+    - ansible_facts['distribution'] == "Debian"
+    - ansible_facts['distribution_major_version'] == "9"
+    - ansible_facts['processor']|string is search("AMD")
+  tags:
+    - apt-initial-install
+    - apt-microcode
+
+- name: (apt.yml) Install CPU microcode for Intel CPU (debian buster)
+  apt:
+    name: "{{ microcode_intel_package }}"
     state: present
     default_release: "{{ ansible_distribution_release }}"
   when:
@@ -122,9 +142,23 @@
     - apt-initial-install
     - apt-microcode
 
-- name: (apt.yml) Install CPU microcode (ubuntu bionic)
+- name: (apt.yml) Install CPU microcode for AMD CPU (debian buster)
   apt:
-    name: "{{ microcode_package }}"
+    name: "{{ microcode_amd_package }}"
+    state: present
+    default_release: "{{ ansible_distribution_release }}"
+  when:
+    - apt_debian_contrib_nonfree_enable
+    - ansible_facts['distribution'] == "Debian"
+    - ansible_facts['distribution_major_version'] == "10"
+    - ansible_facts['processor']|string is search("AMD")
+  tags:
+    - apt-initial-install
+    - apt-microcode
+
+- name: (apt.yml) Install CPU microcode for Intel CPU (ubuntu bionic)
+  apt:
+    name: "{{ microcode_intel_package }}"
     state: present
     default_release: "{{ ansible_distribution_release }}"
   when:
@@ -135,9 +169,23 @@
     - apt-initial-install
     - apt-microcode
 
-- name: (apt.yml) Install CPU microcode (ubuntu xenial)
+- name: (apt.yml) Install CPU microcode for AMD CPU (ubuntu bionic)
   apt:
-    name: "{{ microcode_package }}"
+    name: "{{ microcode_amd_package }}"
+    state: present
+    default_release: "{{ ansible_distribution_release }}"
+  when:
+    - apt_debian_contrib_nonfree_enable
+    - ansible_facts['distribution'] == "Ubuntu"
+    - ansible_facts['distribution_release'] == "bionic"
+    - ansible_facts['processor']|string is search("AMD")
+  tags:
+    - apt-initial-install
+    - apt-microcode
+
+- name: (apt.yml) Install CPU microcode for Intel CPU (ubuntu xenial)
+  apt:
+    name: "{{ microcode_intel_package }}"
     state: present
     default_release: "{{ ansible_distribution_release }}"
   when:
@@ -148,6 +196,49 @@
     - apt-initial-install
     - apt-microcode
 
+- name: (apt.yml) Install CPU microcode for Intel AMD (ubuntu xenial)
+  apt:
+    name: "{{ microcode_amd_package }}"
+    state: present
+    default_release: "{{ ansible_distribution_release }}"
+  when:
+    - apt_debian_contrib_nonfree_enable
+    - ansible_facts['distribution'] == "Ubuntu"
+    - ansible_facts['distribution_release'] == "xenial"
+    - ansible_facts['processor']|string is search("AMD")
+  tags:
+    - apt-initial-install
+    - apt-microcode
+
+# ---
+# Firmware
+# ---
+
+- name: (apt.yml) Install Firmware packages
+  apt:
+     name: "{{ firmware_non_free_packages }}"
+     state: present
+     default_release: "{{ ansible_distribution_release }}"
+  tags:
+    - apt-initial-install
+    - apt-firmware
+
+- name: (apt.yml) Install non-free Firmware packages
+  apt:
+     name: "{{ firmware_non_free_packages }}"
+     state: present
+     default_release: "{{ ansible_distribution_release }}"
+  when:
+    - apt_debian_contrib_nonfree_enable
+  tags:
+    - apt-initial-install
+    - apt-firmware
+
+
+# ---
+# unwanted packages
+# ---
+
 - name: (apt.yml) Remove unwanted packages
   apt:
     name: "{{ apt_remove }}"