update..

roles/common/tasks/apt.yml

@@ -8,10 +8,13 @@
     group: root
     mode: 0644
   register: apt_config_updated
-  when: apt_manage_sources_list|bool
+  when:
+    - ansible_facts['distribution'] == "Debian"
+    - apt_manage_sources_list|bool
   tags:
     - apt-configuration
 
+
 - name: (apt.yml) apt update
   apt:
     update_cache: true
@@ -26,6 +29,7 @@
     - apt-compiler-pkgs
     - apt-webserver-pkgs
 
+
 - name: (apt.yml) dpkg --configure
   command: >
     dpkg --configure -a
@@ -41,6 +45,7 @@
     - apt-compiler-pkgs
     - apt-webserver-pkgs
 
+
 - name: (apt.yml) apt upgrade
   apt:
     upgrade: "{{ apt_upgrade_type }}"
@@ -54,6 +59,7 @@
     - apt-compiler-pkgs
     - apt-webserver-pkgs
 
+
 - name: (apt.yml) Initial install debian packages (stretch)
   apt:
     name: "{{ apt_initial_install_stretch }}"
@@ -64,6 +70,7 @@
   tags:
     - apt-initial-install
 
+
 - name: (apt.yml) Initial install debian packages (buster)
   apt:
     name: "{{ apt_initial_install_buster }}"
@@ -74,12 +81,39 @@
   tags:
     - apt-initial-install
 
-- name: (apt.yml) Ensure we have CPU microcode from backports (debian stretch)
+
+- name: (apt.yml) Initial install ubuntu packages (bionic)
   apt:
-    name: "{{ microcode_package }}"
+    name: "{{ apt_initial_install_bionic }}"
+    state: "{{ apt_install_state }}"
+  when:
+    - ansible_facts['distribution'] == "Ubuntu"
+    - ansible_facts['distribution_release'] == "bionic"
+  tags:
+    - apt-initial-install
+
+- name: (apt.yml) Initial install ubuntu packages (xenial)
+  apt:
+    name: "{{ apt_initial_install_xenial }}"
+    state: "{{ apt_install_state }}"
+  when:
+    - ansible_facts['distribution'] == "Ubuntu"
+    - ansible_facts['distribution_release'] == "xenial"
+  tags:
+    - apt-initial-install
+
+
+# ---
+# Microcode
+# ---
+
+- name: (apt.yml) Ensure we have CPU microcode from backports for Intel CPU (debian stretch)
+  apt:
+    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")
@@ -87,9 +121,26 @@
     - 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:
@@ -100,6 +151,109 @@
     - apt-initial-install
     - apt-microcode
 
+
+- name: (apt.yml) Install CPU microcode for AMD CPU (debian buster)
+  apt:
+    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:
+    - ansible_facts['distribution'] == "Ubuntu"
+    - ansible_facts['distribution_release'] == "bionic"
+    - ansible_facts['processor']|string is search("Intel")
+  tags:
+    - apt-initial-install
+    - apt-microcode
+
+
+- name: (apt.yml) Install CPU microcode for AMD CPU (ubuntu bionic)
+  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'] == "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:
+    - ansible_facts['distribution'] == "Ubuntu"
+    - ansible_facts['distribution_release'] == "xenial"
+    - ansible_facts['processor']|string is search("Intel")
+  tags:
+    - 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 }}"