From 237e3374309534e1f2582449697c958ea659f271 Mon Sep 17 00:00:00 2001 From: Eric Meehan Date: Thu, 31 Jul 2025 10:00:20 -0400 Subject: [PATCH] Pull correct tasks definitions from v1.0.0 --- host_vars/alpha-worker-13.yaml | 1 + host_vars/alpha-worker-14.yaml | 1 + host_vars/alpha-worker-15.yaml | 1 + host_vars/alpha-worker-16.yaml | 1 + host_vars/alpha-worker-17.yaml | 1 + host_vars/evm.yaml | 1 + host_vars/poweredge-r720.yaml | 1 + inventories/eom.dev.yml | 3 ++ poweredge-r720.yaml | 64 ++++++++++++++++++++++------------ roles/ericomeehan.mastodon | 2 +- test.yaml | 4 +-- 11 files changed, 53 insertions(+), 27 deletions(-) create mode 100644 host_vars/evm.yaml diff --git a/host_vars/alpha-worker-13.yaml b/host_vars/alpha-worker-13.yaml index 151d555..cfd4256 100644 --- a/host_vars/alpha-worker-13.yaml +++ b/host_vars/alpha-worker-13.yaml @@ -1,3 +1,4 @@ name: alpha-worker-13 vcpu: + placement: static value: 2 diff --git a/host_vars/alpha-worker-14.yaml b/host_vars/alpha-worker-14.yaml index ac76480..36824f2 100644 --- a/host_vars/alpha-worker-14.yaml +++ b/host_vars/alpha-worker-14.yaml @@ -1,3 +1,4 @@ name: alpha-worker-14 vcpu: + placement: static value: 2 diff --git a/host_vars/alpha-worker-15.yaml b/host_vars/alpha-worker-15.yaml index 31aa866..65db49a 100644 --- a/host_vars/alpha-worker-15.yaml +++ b/host_vars/alpha-worker-15.yaml @@ -1,3 +1,4 @@ name: alpha-worker-15 vcpu: + placement: static value: 2 diff --git a/host_vars/alpha-worker-16.yaml b/host_vars/alpha-worker-16.yaml index e15b833..971d73f 100644 --- a/host_vars/alpha-worker-16.yaml +++ b/host_vars/alpha-worker-16.yaml @@ -1,3 +1,4 @@ name: alpha-worker-16 vcpu: + placement: static value: 2 diff --git a/host_vars/alpha-worker-17.yaml b/host_vars/alpha-worker-17.yaml index 416c135..79936a3 100644 --- a/host_vars/alpha-worker-17.yaml +++ b/host_vars/alpha-worker-17.yaml @@ -1,3 +1,4 @@ name: alpha-worker-17 vcpu: + placement: static value: 2 diff --git a/host_vars/evm.yaml b/host_vars/evm.yaml new file mode 100644 index 0000000..5077d87 --- /dev/null +++ b/host_vars/evm.yaml @@ -0,0 +1 @@ +name: evm diff --git a/host_vars/poweredge-r720.yaml b/host_vars/poweredge-r720.yaml index 09a41ff..ed6d36b 100644 --- a/host_vars/poweredge-r720.yaml +++ b/host_vars/poweredge-r720.yaml @@ -13,4 +13,5 @@ libvirt_guests: - alpha-worker-15 - alpha-worker-16 - alpha-worker-17 + - evm nfs_exports: ["/data *(rw,sync,no_root_squash)"] diff --git a/inventories/eom.dev.yml b/inventories/eom.dev.yml index a1f0848..5b20856 100644 --- a/inventories/eom.dev.yml +++ b/inventories/eom.dev.yml @@ -15,6 +15,9 @@ all: vms: children: + user: + hosts: + evm: clusters: children: control_planes: diff --git a/poweredge-r720.yaml b/poweredge-r720.yaml index 2d44b83..95d5ce7 100644 --- a/poweredge-r720.yaml +++ b/poweredge-r720.yaml @@ -55,9 +55,19 @@ line: 'net.ipv6.conf.all.forwarding = 1' state: present + - name: Copy interfaces template + template: + src: interfaces.j2 + dest: /etc/network/interfaces + - name: Reload sysctl configuration command: sysctl --system + - name: Reload network service + service: + name: networking + state: restarted + - name: Define libvirt networks community.libvirt.virt_net: name: "{{ item.name }}" @@ -77,51 +87,50 @@ autostart: true loop: "{{ libvirt_networks }}" - - name: Ensure that a network is active (needs to be defined and built first) - community.libvirt.virt_net: - state: active - name: "{{ item.name }}" - loop: "{{ libvirt_networks }}" - - - name: Download base image for guests + - name: Download base image get_url: url: https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-generic-amd64.qcow2 + dest: /var/lib/libvirt/images/debian-12-generic-amd64.qcow2 + force: true + + - name: Copy base image + copy: + src: /var/lib/libvirt/images/debian-12-generic-amd64.qcow2 + remote_src: true dest: "/var/lib/libvirt/images/{{ item }}.qcow2" force: true loop: "{{ libvirt_guests }}" - - name: Create cloud-config directory for guests + - name: Resize images + command: "qemu-img resize -f qcow2 /var/lib/libvirt/images/{{ item }}.qcow2 16G" + loop: "{{ libvirt_guests }}" + + - name: Create cloud-config directory file: - path: "/var/lib/libvirt/configs/{{ item }}" + path: "/tmp/{{ item }}" state: directory loop: "{{ libvirt_guests }}" - - name: Copy cloud-config templates for guests + - name: Copy cloud-config user-data template template: src: user-data.j2 - dest: "/var/lib/libvirt/configs/{{ domain.name }}/user-data" + dest: "/tmp/{{ domain.name }}/user-data" force: true loop: "{{ libvirt_guests }}" vars: domain: "{{ hostvars[item] }}" - - name: Copy cloud-config templates for guests + - name: Copy cloud-config meta-data template template: src: meta-data.j2 - dest: "/var/lib/libvirt/configs/{{ domain.name }}/meta-data" + dest: "/tmp/{{ domain.name }}/meta-data" force: true loop: "{{ libvirt_guests }}" vars: domain: "{{ hostvars[item] }}" - - name: Generate iso for guests - command: "genisoimage -output /var/lib/libvirt/images/{{ item }}.iso -volid cidata -joliet -rock /var/lib/libvirt/configs/{{ item }}/user-data /var/lib/libvirt/configs/{{ item }}/meta-data" - loop: "{{ libvirt_guests }}" - - - name: Copy logging config for guests - copy: - src: 05_logging.cfg - dest: "/var/lib/libvirt/configs/{{ item }}/05_logging.cfg" + - name: Generate iso + command: "genisoimage -output /var/lib/libvirt/images/{{ item }}.iso -volid cidata -joliet -rock /tmp/{{ item }}/user-data /tmp/{{ item }}/meta-data" loop: "{{ libvirt_guests }}" - name: Define libvirt virtual machine @@ -138,12 +147,20 @@ command: create loop: "{{ libvirt_guests }}" - - name: Autostart libvirt virtual machine + - name: Autostart libvirt virtual machines community.libvirt.virt: name: "{{ item }}" autostart: true loop: "{{ libvirt_guests }}" + - name: Wait for guest initialization + wait_for: + timeout: 300 + + - name: Reset libvirt virtual machines for filesystem resize + command: "virsh reset {{ item }}" + loop: "{{ libvirt_guests }}" + - name: Wait for manual tasks hosts: localhost tasks: @@ -158,6 +175,7 @@ - alpha-worker-15 - alpha-worker-16 - alpha-worker-17 + - evm become: true vars_files: - ../secrets.yaml @@ -216,7 +234,7 @@ - role: geerlingguy.kubernetes - name: Deploy base Kubernetes resources - hosts: alpha_control_plane + hosts: alpha-control-plane become: true tasks: - name: Deploy NFS Provisioner diff --git a/roles/ericomeehan.mastodon b/roles/ericomeehan.mastodon index 410e87d..5de5270 160000 --- a/roles/ericomeehan.mastodon +++ b/roles/ericomeehan.mastodon @@ -1 +1 @@ -Subproject commit 410e87d127cdc942f01bbed09b6a6c1ba041d237 +Subproject commit 5de5270b7346a6b4a3c69fbea3aa56116f158547 diff --git a/test.yaml b/test.yaml index baa622e..ac66d2e 100644 --- a/test.yaml +++ b/test.yaml @@ -4,6 +4,4 @@ vars_files: - ../secrets.yaml roles: - - role: ericomeehan.matrix-stack - vars: - server_name: eom.dev + - role: ericomeehan.mastodon