update..

roles/common/tasks/apt.yml

@@ -228,22 +228,36 @@
 # Firmware
 # ---
 
-- name: (apt.yml) Install Firmware packages
+- name: (apt.yml) Install Firmware packages (Ubuntu)
   apt:
-     name: "{{ firmware_non_free_packages }}"
+     name: "{{ firmware_packages_ubuntu }}"
      state: present
      default_release: "{{ ansible_distribution_release }}"
+  when:
+    - ansible_facts['distribution'] == "Ubuntu"
+  tags:
+    - apt-initial-install
+    - apt-firmware
+
+- name: (apt.yml) Install Firmware packages (Debian)
+  apt:
+     name: "{{ firmware_packages_debian }}"
+     state: present
+     default_release: "{{ ansible_distribution_release }}"
+  when:
+    - ansible_facts['distribution'] == "Debian"
   tags:
     - apt-initial-install
     - apt-firmware
 
 
-- name: (apt.yml) Install non-free Firmware packages
+- name: (apt.yml) Install non-free Firmware packages (Debian)
   apt:
-     name: "{{ firmware_non_free_packages }}"
+     name: "{{ firmware_non_free_packages_debian }}"
      state: present
      default_release: "{{ ansible_distribution_release }}"
   when:
+    - ansible_facts['distribution'] == "Debian"
     - apt_debian_contrib_nonfree_enable
   tags:
     - apt-initial-install

roles/common/tasks/main.yml

@@ -143,6 +143,12 @@
     - samba-shares
 
 
+#- import_tasks: mount_samba_shares.yml
+#  when: "groups['client_pc']|string is search(inventory_hostname)"
+#  tags:
+#    - samba-shares
+
+
 # tags supported system-user-systemfiles.yml:
 #
 #    profile