ansible/inventory/inventory.yaml

@@ -18,9 +18,9 @@ all:
                   ansible_host: node2.balsillie.net
                 node3:
                   ansible_host: node3.balsillie.net
-          hosts:
-            router:
-              ansible_host: router.balsillie.net
+            hosts:
+              router:
+                ansible_host: router.balsillie.net
     workstations:
       children:
         arch:
@@ -30,6 +30,5 @@ all:
             sff:
               ansible_host: sff.balsillie.net
         windows:
-          hosts:
-            bridie:
-              ansible_host: bridie.balsillie.net
+          bridie:
+            ansible_host: bridie.balsillie.net

ansible/playbooks/lab.yaml

@@ -5,8 +5,8 @@
   become: true
 
   roles:
-    - python-install
+    - python
     - sshd
-    #- firewall
+    - firewall
     - pikaur
-    - zfs-install
+    #- zfs

ansible/roles/pikaur/tasks/main.yml

@@ -14,37 +14,18 @@
     name:
       - base-devel
       - git
-      - pyalpm
-      - python-docutils
-      - python-future
-      - python-commonmark
     state: latest
     update_cache: true
     reason: explicit
 
 - name: clone git repo
-  become: false
   ansible.builtin.git:
     repo: 'https://aur.archlinux.org/pikaur.git'
     dest: /git/pikaur
     depth: 1
     single_branch: yes
 
-- name: make pikaur package
-  become: false
+- name: make/install pikaur
   ansible.builtin.shell:
-    cmd: makepkg
+    cmd: makepkg -fsri
     chdir: /git/pikaur/
-    creates: pikaur-1.11-1-any.pkg.tar.zst
-
-- name: install built pikaur package
-  become: true
-  community.general.pacman:
-    name: /git/pikaur/pikaur-1.11-1-any.pkg.tar.zst
-    state: present
-
-- name: update AUR cache
-  become: true
-  community.general.pacman:
-    update_cache: yes
-    executable: pikaur

ansible/roles/zfs-install/tasks/main.yml

@@ -1,15 +0,0 @@
----
-- name: Install ZFS DKMS module
-  become: true
-  ansible.builtin.shell:
-    cmd: pikaur -S zfs-dkms --noconfirm
-    executable: /usr/bin/bash
-
-# install linux-lts-headers first
-# add a gpg signing key, import and lsign the AUR key below
-# https://gist.github.com/woods/8970150
-# zfs-dkms AUR key 6AD860EED4598027 / 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027
-
-set zfs params (ARC)
-modprobe zfs
-set module to start at boot