From 706ab302a786946a2a8c1908c69880dd1b7e63c5 Mon Sep 17 00:00:00 2001
From: Scott Wallace <scott@wallace.sh>
Date: Sun, 24 Feb 2019 19:32:50 +0000
Subject: [PATCH] Create tasks for individual platforms as we need more than
 just packages

---
 .../files/google-laptop-audio.tar.gz             | Bin 0 -> 2156 bytes
 .../includes/platform_apple inc._laptop.yaml     |   8 ++++++++
 .../tasks/includes/platform_google_laptop.yaml   |  10 ++++++++++
 .ansible/roles/linux_desktop/tasks/main.yaml     |  13 +++++++++++++
 .ansible/roles/linux_desktop/tasks/software.yaml |  10 ----------
 .ansible/roles/linux_desktop/vars/main.yaml      |   5 -----
 6 files changed, 31 insertions(+), 15 deletions(-)
 create mode 100644 .ansible/roles/linux_desktop/files/google-laptop-audio.tar.gz
 create mode 100644 .ansible/roles/linux_desktop/tasks/includes/platform_apple inc._laptop.yaml
 create mode 100644 .ansible/roles/linux_desktop/tasks/includes/platform_google_laptop.yaml

diff --git a/.ansible/roles/linux_desktop/files/google-laptop-audio.tar.gz b/.ansible/roles/linux_desktop/files/google-laptop-audio.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..50ad4e807c0f350136a49e41c01257936acb64cc
GIT binary patch
literal 2156
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

literal 0
HcmV?d00001

diff --git a/.ansible/roles/linux_desktop/tasks/includes/platform_apple inc._laptop.yaml b/.ansible/roles/linux_desktop/tasks/includes/platform_apple inc._laptop.yaml
new file mode 100644
index 0000000..fcff066
--- /dev/null
+++ b/.ansible/roles/linux_desktop/tasks/includes/platform_apple inc._laptop.yaml	
@@ -0,0 +1,8 @@
+- name: 'Platform: Apple Inc. Laptop'
+  tags:
+    - platform
+  package:
+    name: "{{ item }}"
+    state: present
+  loop: ['mbpfan']
+  become: true
diff --git a/.ansible/roles/linux_desktop/tasks/includes/platform_google_laptop.yaml b/.ansible/roles/linux_desktop/tasks/includes/platform_google_laptop.yaml
new file mode 100644
index 0000000..bb38ac2
--- /dev/null
+++ b/.ansible/roles/linux_desktop/tasks/includes/platform_google_laptop.yaml
@@ -0,0 +1,10 @@
+- name: 'Platform: Google Laptop (Chromebook)'
+  tags:
+    - platform
+
+  block:
+    - name: 'Platform: Google Laptop: Audio drivers'
+      unarchive:
+        src: files/google-laptop-audio.tar.gz
+        dest: /
+      become: true
diff --git a/.ansible/roles/linux_desktop/tasks/main.yaml b/.ansible/roles/linux_desktop/tasks/main.yaml
index 81f6ea7..91cb5c4 100644
--- a/.ansible/roles/linux_desktop/tasks/main.yaml
+++ b/.ansible/roles/linux_desktop/tasks/main.yaml
@@ -1,2 +1,15 @@
 - import_tasks: software.yaml
 - import_tasks: config.yaml
+
+- name: Check platform-specific file exists
+  tags:
+    - platform
+  stat:
+    path: "{{ role_path }}/tasks/includes/platform_{{ ansible_system_vendor | lower + '_' + ansible_form_factor | lower }}.yaml"
+  register: platform_file
+
+- name: Include platform-specific file
+  tags:
+    - platform
+  include_tasks: "{{ platform_file.stat.path }}"
+  when: platform_file.stat.exists
diff --git a/.ansible/roles/linux_desktop/tasks/software.yaml b/.ansible/roles/linux_desktop/tasks/software.yaml
index 69a9fb4..e616899 100644
--- a/.ansible/roles/linux_desktop/tasks/software.yaml
+++ b/.ansible/roles/linux_desktop/tasks/software.yaml
@@ -77,16 +77,6 @@
       command: 'fc-cache -f'
   when: fontfile.stat.exists == false
 
-- name: Platform specific packages
-  tags:
-    - install
-    - platform
-  package:
-    name: "{{ item }}"
-    state: present
-  loop: "{{ lookup('vars', ansible_system_vendor + '_' + ansible_form_factor + '_packages', default=[]) }}"
-  become: true
-
 - name: 'Gnome extensions'
   tags:
     - install
diff --git a/.ansible/roles/linux_desktop/vars/main.yaml b/.ansible/roles/linux_desktop/vars/main.yaml
index 188aa0d..5d428e1 100644
--- a/.ansible/roles/linux_desktop/vars/main.yaml
+++ b/.ansible/roles/linux_desktop/vars/main.yaml
@@ -59,8 +59,3 @@ gnome_extension_ids:
   - 28     # gtile
   - 1386   # notification counter
   - 19     # user themes
-
-# Platform specific packages
-# Format: systemvendor_formfactor_packages
-"Apple Inc._Laptop_packages":
-  - mbpfan