fix: use import instead of include

.gitignore

@@ -3,6 +3,7 @@
 terraform.tfstate
 terraform.tfstate.backup
 ansible/lookup_plugins
+ansible/galaxy_roles
 
 !.gitignore
 !.editorconfig

Justfile

@@ -4,16 +4,17 @@ opentofu_dir := "infra/"
 ansible_proton_pass_plugin_ref := "4bd0741c347646060ec59c73f8adf7ed8e706cf3"
 ansible_proton_pass_plugin_url := "https://raw.githubusercontent.com/protonpass/proton-pass-ansible-integration/" + ansible_proton_pass_plugin_ref + "/lookup_plugins/proton_pass.py"
 
+init: tofu-init fetch-ansible-deps fetch-ansible-plugins
 up: tofu-apply ansible-run-playbook
 down: tofu-destroy
 
 tofu-init:
     tofu -chdir={{ opentofu_dir }} init -upgrade
 
-tofu-apply: tofu-init
+tofu-apply:
     tofu -chdir={{ opentofu_dir }} apply -auto-approve
 
-tofu-destroy: tofu-init
+tofu-destroy:
     tofu -chdir={{ opentofu_dir }} apply -auto-approve -destroy
 
 tofu-destroy-instances:
@@ -30,6 +31,9 @@ headlamp:
 clean: tofu-destroy
     git clean -fdx
 
-fetch-plugins:
+fetch-ansible-deps:
+    ansible-galaxy install --role-file ansible/requirements.yml --roles-path ansible/galaxy_roles
+
+fetch-ansible-plugins:
     mkdir -p ansible/lookup_plugins
     curl -fsSL -o ansible/lookup_plugins/proton_pass.py {{ ansible_proton_pass_plugin_url }}

README.md

@@ -1,5 +1,8 @@
 # Home Infrastructure
 
+An Ansible + OpenTofu project for installing a minimal Kubernetes installation
+to bare-metal and virtual machines.
+
 ## Quick Start
 
 Get started with a local Kubernetes cluster which can be used to design and test
@@ -13,13 +16,19 @@ new configuration before pushing them to real machines.
     export SSH_AUTH_SOCK="$HOME/.ssh/proton-pass-agent.sock"
     ```
 
-2. Launch Incus virtual machines
+2. Install the Proton Pass plugin for Ansible
+
+    ```shell
+    just fetch-plugins
+    ```
+
+3. Launch Incus virtual machines
 
     ```shell
     just up
     ```
 
-3. Tear down the Incus virtual machines
+4. Tear down the Incus virtual machines
 
     ```shell
     just down

ansible.cfg

@@ -1,3 +1,4 @@
 [defaults]
+roles_path = ansible/roles:ansible/galaxy_roles
 lookup_plugins = ansible/lookup_plugins
 callback_result_format = yaml

ansible/inventories/bare_metal/hosts.yaml

@@ -1,8 +0,0 @@
-masters:
-  hosts:
-    vineta:
-      ansible_host: 10.0.0.201
-    rotfront:
-      ansible_host: 10.0.0.202
-    leng:
-      ansible_host: 10.0.0.203

ansible/inventories/hive/group_vars/all.yaml

@@ -3,5 +3,6 @@ ansible_become_exe: sudo.ws
 ansible_user: kolibri
 vip_interface: eno1
 vip_address: 10.0.0.200
+cluster_name: hive
 cluster_pod_subnet: 172.16.0.0/16
 cluster_service_subnet: 10.96.0.0/16

ansible/inventories/hive/hosts.yaml

@@ -0,0 +1,8 @@
+masters:
+  hosts:
+    vineta:
+      ansible_host: vineta.local
+    rotfront:
+      ansible_host: rotfront.local
+    leng:
+      ansible_host: leng.local

ansible/inventories/incus/group_vars/all.yaml

@@ -2,5 +2,6 @@ ansible_python_interpreter: /usr/bin/python3
 ansible_user: kolibri
 vip_interface: enp5s0
 vip_address: 10.150.0.100
+cluster_name: hive
 cluster_pod_subnet: 172.16.0.0/16
 cluster_service_subnet: 10.96.0.0/16

ansible/playbooks/performance.yaml

@@ -0,0 +1,7 @@
+---
+- name: Configure performance tuning
+  hosts: all
+  become: true
+  roles:
+    - giovtorres.tuned
+    - irqbalance

ansible/playbooks/provisioning.yaml

@@ -10,6 +10,7 @@
         groups:
           - sudo
         shell: /bin/bash
+        system: true
 
     - name: Ensure authorised keys for Kolibri
       ansible.posix.authorized_key:

ansible/requirements.yml

@@ -0,0 +1,6 @@
+---
+collections:
+  - ansible.posix
+roles:
+  - name: giovtorres.tuned
+    version: 2.0.2

ansible/roles/irqbalance/tasks/main.yaml

@@ -0,0 +1,11 @@
+---
+- name: Install irqbalance
+  ansible.builtin.package:
+    name: irqbalance
+    state: present
+
+- name: Ensure irqbalance service
+  ansible.builtin.service:
+    name: irqbalance
+    state: started
+    enabled: true

ansible/roles/kubernetes_control_plane/tasks/main.yaml

@@ -2,13 +2,13 @@
   ansible.builtin.import_tasks: kube-vip.yaml
 
 - name: Initialise Kubernetes cluster
-  ansible.builtin.include_tasks: init-cluster.yaml
+  ansible.builtin.import_tasks: init-cluster.yaml
 
 - name: Join nodes as control planes
-  ansible.builtin.include_tasks: join-cluster.yaml
+  ansible.builtin.import_tasks: join-cluster.yaml
 
 - name: Copy Kubernetes admin configuration on all nodes
-  ansible.builtin.include_tasks: copy-config.yaml
+  ansible.builtin.import_tasks: copy-config.yaml
 
 - name: Remove control plane scheduling restrictions
-  ansible.builtin.include_tasks: untaint.yaml
+  ansible.builtin.import_tasks: untaint.yaml

ansible/roles/kubernetes_control_plane/templates/kubeadm-config.yaml.j2

@@ -4,7 +4,7 @@ kind: InitConfiguration
 ---
 apiVersion: kubeadm.k8s.io/v1beta4
 kind: ClusterConfiguration
-clusterName: aeon
+clusterName: "{{ cluster_name }}"
 controlPlaneEndpoint: "{{ vip_address }}"
 networking:
   podSubnet: "{{ cluster_pod_subnet }}"

ansible/site.yaml

@@ -1,3 +1,6 @@
+- name: Apply power and performance settings
+  ansible.builtin.import_playbook: playbooks/performance.yaml
+
 - name: Baseline configuration
   hosts: all
   become: true
@@ -5,10 +8,6 @@
     - common
     - kubernetes_common
 
-# ========================
-# Setup Kubernetes Cluster
-# ========================
-
 - name: Initialise Kubernetes Cluster
   hosts: masters
   become: true

infra/main.tofu

@@ -3,14 +3,10 @@
 # ------
 
 locals {
+  image          = "ubuntu/26.04"
   root_disk_size = "16GiB"
   ext_disk_size  = "16GiB"
   network_cidr   = "10.150.0.1/24"
-
-  master_count = 3
-  worker_count = 0
-
-  image = "ubuntu/26.04"
 }
 
 # ---------
@@ -46,7 +42,7 @@ resource "incus_network" "this" {
 
 module "master" {
   source = "./modules/incus_vm"
-  count  = local.master_count
+  count  = var.master_count
 
   name    = "master-${count.index}"
   project = incus_project.this.name
@@ -60,7 +56,7 @@ module "master" {
 
 module "worker" {
   source = "./modules/incus_vm"
-  count  = local.worker_count
+  count  = var.worker_count
 
   name    = "worker-${count.index}"
   project = incus_project.this.name
@@ -77,7 +73,7 @@ module "worker" {
 # ---------
 
 terraform {
-  required_version = "~> 1.12"
+  required_version = ">= 1.11.5"
 
   required_providers {
     incus = {

infra/variables.tofu

@@ -1,3 +1,17 @@
+variable "master_count" {
+  description = "The number of master nodes to provision."
+  type        = number
+  default     = 1
+  nullable    = false
+}
+
+variable "worker_count" {
+  description = "The number of worker nodes to provision."
+  type        = number
+  default     = 0
+  nullable    = false
+}
+
 variable "cpus" {
   description = "The number of CPU cores allocated to each virtual machine."
   type        = number