updated common plays, cleanups & bug fixes

main.yml

@@ -1,10 +1,7 @@
 ---
-# Common
+# Common node configuration, run via ansible-pull.
 - name: Common Node Configuration
   hosts: all
   become: true
-  vars_files:
-    - group_vars/vars.yml
   roles:
-    - role: base_packages
+    - role: common
-    - role: example_config

roles/common/defaults/main.yml

@@ -1,3 +1,4 @@
+---
 ### Signalytic Directories ###
 
 default_user: "signalytic"

roles/common/tasks/create-dirs.yml

@@ -1,3 +1,4 @@
+---
 - name: Check signalytic directories exist
   ansible.builtin.file:
     path: "{{ item }}"

roles/common/tasks/install-cellmodem-package.yml

@@ -1,6 +1,7 @@
+---
 - name: Extract cellmodem package
   ansible.builtin.unarchive:
-    src: packages/cellmodem-scripts-v15.tar.bz2
+    src: files/cellmodem-scripts-v15.tar.bz2
     dest: /tmp
     remote_src: false
   become: true

roles/common/tasks/install-power-management.yml

@@ -1,6 +1,7 @@
+---
 - name: Extract power-management package
   ansible.builtin.unarchive:
-    src: packages/power-management-v11.tar.bz2
+    src: files/power-management-v11.tar.bz2
     dest: /tmp
     remote_src: false
   become: true

roles/common/tasks/install-signalytic-ap.yml

@@ -1,6 +1,7 @@
+---
 - name: Extract signalytic-ap package
   ansible.builtin.unarchive:
-    src: packages/signalytic-ap-manager-5.v5.tar.bz2
+    src: files/signalytic-ap-manager-5.v5.tar.bz2
     dest: /tmp
     remote_src: false
   become: true

roles/common/tasks/install-signalytic-deb.yml

@@ -1,13 +1,14 @@
+---
 ## Network Manager
 - name: Install signalytic-network manager
   ansible.builtin.apt:
-    deb: packages/signalytic-network-manager-1.1.v1-1_all.deb
+    deb: files/signalytic-network-manager-1.1.v1-1_all.deb
     fail_on_autoremove: true
   become: true
 
 ## Battery Manager
 - name: Install signalytic-battery manager
   ansible.builtin.apt:
-    deb: packages/signalytic-battery-manager_3.0_all.deb
+    deb: files/signalytic-battery-manager_3.0_all.deb
     fail_on_autoremove: true
   become: true

roles/common/tasks/main.yml

@@ -0,0 +1,18 @@
+---
+- name: Create system directories
+  ansible.builtin.import_tasks: create-dirs.yml
+
+- name: Install system utilities
+  ansible.builtin.import_tasks: system-utils.yml
+
+- name: Install signalytic-debian packages
+  ansible.builtin.import_tasks: install-signalytic-deb.yml
+
+- name: Install cellmodem package
+  ansible.builtin.import_tasks: install-cellmodem-package.yml
+
+- name: Install power-management package
+  ansible.builtin.import_tasks: install-power-management.yml
+
+- name: Install signalytic-ap package
+  ansible.builtin.import_tasks: install-signalytic-ap.yml

roles/common/tasks/system-utils.yml

@@ -1,3 +1,4 @@
+---
 - name: Install system utils
   ansible.builtin.apt:
     name:

roles/tasks/main.yml

@@ -1,17 +0,0 @@
-- name: Create system directories
-  ansible.legacy.import_tasks: create-dirs.yml
-
-- name: Install system utilities
-  ansible.legacy.import_tasks: system-utils.yml
-
-- name: Install signalytic-debian packages
-  ansible.legacy.import_tasks: install-signalytic-deb.yml
-
-- name: Install cellmodem package
-  ansible.legacy.import_tasks: install-cellmodem-package.yml
-
-- name: Install power-management package
-  ansible.legacy.import_tasks: install-power-management.yml
-
-- name: Install signalytic-ap package
-  ansible.legacy.import_tasks: install-signalytic-ap.yml