Revert "Merge branch 'ft-ansible-common' into 'develop'"

This reverts merge request !2

.gitignore

@@ -1 +0,0 @@
-.zed/

ansible.cfg

@@ -0,0 +1,5 @@
+[defaults]
+inventory = localhost,
+roles_path = ./roles
+retry_files_enabled = False
+interpreter_python = auto_silent

group_vars/all.yml

@@ -0,0 +1,4 @@
+---
+
+# Version of the common config repo, rendered into example.conf.
+group_version: "common-1.0.0"

main.yml

@@ -1,7 +1,11 @@
 ---
-# Common node configuration, run via ansible-pull.
+# Common playbook. Imported by the node-specific playbook in the local repo;
-- name: Common Node Configuration
+# can also be run on its own for testing.
+- name: Common node configuration
   hosts: all
   become: true
+  vars_files:
+    - group_vars/all.yml
   roles:
-    - role: common
+    - role: base_packages
+    - role: example_config

roles/base_packages/defaults/main.yml

@@ -0,0 +1,6 @@
+---
+
+apt_packages:
+  - xz-utils
+  - tree
+  - nano

roles/base_packages/tasks/main.yml

@@ -0,0 +1,8 @@
+---
+
+- name: Install baseline packages
+  ansible.builtin.apt:
+    name: "{{ apt_packages }}"
+    state: present
+    update_cache: true
+    cache_valid_time: 3600

roles/common/defaults/main.yml

@@ -1,10 +0,0 @@
----
-### Signalytic Directories ###
-
-default_user: "root"
-signalytic_root_ansible_dir: "/var/signalytic/ansible"
-signalytic_common_dir: "{{ signalytic_root_ansible_dir }}/common"
-signalytic_clientapps_dir: "/var/signalytic/clientapps"
-
-### Node config directories ###
-node_config: "{{ signalytic_root_ansible_dir }}/config"

roles/common/scripts/install-k3s.sh

@@ -1,3 +0,0 @@
-#! /bin/bash
-
-curl -sfL https://get.k3s.io | sh -

roles/common/tasks/create-dirs.yml

@@ -1,14 +0,0 @@
----
-- name: Check signalytic directories exist
-  ansible.builtin.file:
-    path: "{{ item }}"
-    state: directory
-    owner: "{{ default_user }}"
-    group: "{{ default_user }}"
-    mode: "0755"
-  become: true
-  loop:
-    - "{{ signalytic_root_ansible_dir }}"
-    - "{{ signalytic_common_dir }}"
-    - "{{ signalytic_clientapps_dir }}"
-    - "{{ node_config }}"

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

@@ -1,30 +0,0 @@
----
-- name: Extract cellmodem package
-  ansible.builtin.unarchive:
-    src: files/cellmodem-scripts-v15.tar.bz2
-    dest: /tmp
-    remote_src: false
-  become: true
-
-- name: Find the top-level extracted directory
-  ansible.builtin.find:
-    paths: /tmp
-    file_type: directory
-    recurse: false
-    patterns: "cellmodem-scripts-*"
-  register: extracted_dir
-  become: true
-
-- name: Fail if the archive layout is unexpected
-  ansible.builtin.assert:
-    that:
-      - extracted_dir.matched == 1
-    fail_msg: >-
-      Expected exactly one cellmodem-scripts-* directory in /tmp,
-      found {{ extracted_dir.matched }}. Check the archive structure.
-
-- name: Run the install script from the top-level directory
-  ansible.builtin.command:
-    cmd: ./install.sh
-    chdir: "{{ extracted_dir.files[0].path }}"
-  become: true

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

@@ -1,30 +0,0 @@
----
-- name: Extract power-management package
-  ansible.builtin.unarchive:
-    src: files/power-management-v11.tar.bz2
-    dest: /tmp
-    remote_src: false
-  become: true
-
-- name: Find the top-level extracted directory
-  ansible.builtin.find:
-    paths: /tmp
-    file_type: directory
-    recurse: false
-    patterns: "power-management-*"
-  register: extracted_dir
-  become: true
-
-- name: Fail if the archive layout is unexpected
-  ansible.builtin.assert:
-    that:
-      - extracted_dir.matched == 1
-    fail_msg: >-
-      Expected exactly one power-management-* directory in /tmp,
-      found {{ extracted_dir.matched }}. Check the archive structure.
-
-- name: Run the install script from the top-level directory
-  ansible.builtin.command:
-    cmd: ./install.sh
-    chdir: "{{ extracted_dir.files[0].path }}"
-  become: true

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

@@ -1,30 +0,0 @@
----
-- name: Extract signalytic-ap package
-  ansible.builtin.unarchive:
-    src: files/signalytic-ap-manager-5.v5.tar.bz2
-    dest: /tmp
-    remote_src: false
-  become: true
-
-- name: Find the top-level extracted directory
-  ansible.builtin.find:
-    paths: /tmp
-    file_type: directory
-    recurse: false
-    patterns: "signalytic-ap-manager-*"
-  register: extracted_dir
-  become: true
-
-- name: Fail if the archive layout is unexpected
-  ansible.builtin.assert:
-    that:
-      - extracted_dir.matched == 1
-    fail_msg: >-
-      Expected exactly one signalytic-ap-manager-* directory in /tmp,
-      found {{ extracted_dir.matched }}. Check the archive structure.
-
-- name: Run the install script from the top-level directory
-  ansible.builtin.command:
-    cmd: ./install.sh
-    chdir: "{{ extracted_dir.files[0].path }}"
-  become: true

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

@@ -1,14 +0,0 @@
----
-## Network Manager
-- name: Install signalytic-network manager
-  ansible.builtin.apt:
-    deb: "{{ role_path }}/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: "{{ role_path }}/files/signalytic-battery-manager_3.0_all.deb"
-    fail_on_autoremove: true
-  become: true

roles/common/tasks/main.yml

@@ -1,18 +0,0 @@
----
-- 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,25 +0,0 @@
----
-- name: Install system utils
-  ansible.builtin.apt:
-    name:
-      - xz-utils
-      - git
-      - modemmanager
-    state: present
-    update_cache: true
-  become: true
-  register: apt_result
-  until: apt_result is succeeded
-  retries: 7
-  delay: 5
-
-- name: Check if k3s is installed
-  ansible.builtin.stat:
-    path: /usr/local/bin/k3s
-  register: k3s_binary
-
-- name: Install k3s
-  ansible.builtin.script:
-    cmd: scripts/install-k3s.sh
-  become: true
-  when: not k3s_binary.stat.exists

roles/example_config/defaults/main.yml

@@ -0,0 +1,7 @@
+---
+
+signalytic_config_dir: /etc/signalytic
+
+# Overridden by group_vars/all.yml (common repo) and host_vars.yml (local repo).
+group_version: "unset"
+host_version: "unset"

roles/example_config/tasks/main.yml

@@ -0,0 +1,17 @@
+---
+
+- name: Create signalytic config directory
+  ansible.builtin.file:
+    path: "{{ signalytic_config_dir }}"
+    state: directory
+    owner: root
+    group: root
+    mode: "0755"
+
+- name: Render example.conf
+  ansible.builtin.template:
+    src: example.conf.j2
+    dest: "{{ signalytic_config_dir }}/example.conf"
+    owner: root
+    group: root
+    mode: "0644"

roles/example_config/templates/example.conf.j2

@@ -0,0 +1,2 @@
+group_version = {{ group_version }}
+host_version = {{ host_version }}