From ac7abefb774c15e7b0af126abca0b1bd5606b533 Mon Sep 17 00:00:00 2001 From: DarkFeather Date: Mon, 10 Aug 2026 16:33:41 -0500 Subject: [PATCH] Concluding the testing of the Geth role --- examples/msn0.yml | 48 ++++++++++++++++++----------------- roles/Geth/tasks/main.yml | 3 --- roles/Geth/tasks/primary.yml | 7 +++++ roles/Geth/tasks/services.yml | 8 ------ roles/Geth/tasks/worker.yml | 13 +++++++--- 5 files changed, 42 insertions(+), 37 deletions(-) delete mode 100644 roles/Geth/tasks/services.yml diff --git a/examples/msn0.yml b/examples/msn0.yml index 825bab9..7f089e6 100644 --- a/examples/msn0.yml +++ b/examples/msn0.yml @@ -100,40 +100,42 @@ all: ups: 'apc' active_vms: - Yggdrasil - Geth: - vars: - geth_primary: Geth1 + pitest: hosts: Geth0: ipinterface: eth0 ip: 10.0.1.9 mac: b8:27:eb:09:a1:a0 static: true + Geth5: + ipinterface: eth0 + ip: 10.0.1.14 + mac: b8:27:eb:81:f5:4b + static: true + Geth: + vars: + geth_primary: Geth1 + hosts: Geth1: ipinterface: eth0 ip: 10.0.1.10 mac: e4:5f:01:01:ff:d5 static: true - # Geth2: - # ipinterface: eth0 - # ip: 10.0.1.11 - # mac: e4:5f:01:01:ff:9c - # static: true - # Geth3: - # ipinterface: eth0 - # ip: 10.0.1.12 - # mac: e4:5f:01:01:ff:96 - # static: true - # Geth4: - # ipinterface: eth0 - # ip: 10.0.1.13 - # mac: e4:5f:01:01:ff:e4 - # static: true - # Geth5: - # ipinterface: eth0 - # ip: 10.0.1.14 - # mac: b8:27:eb:81:f5:4b - # static: true + Geth2: + ipinterface: eth0 + ip: 10.0.1.11 + mac: e4:5f:01:01:ff:9c + static: true + Geth3: + ipinterface: eth0 + ip: 10.0.1.12 + mac: e4:5f:01:01:ff:96 + static: true + Geth4: + ipinterface: eth0 + ip: 10.0.1.13 + mac: e4:5f:01:01:ff:e4 + static: true virtual: # 10.0.1.16/28 vars: hosts: diff --git a/roles/Geth/tasks/main.yml b/roles/Geth/tasks/main.yml index e18af93..43041ff 100644 --- a/roles/Geth/tasks/main.yml +++ b/roles/Geth/tasks/main.yml @@ -14,6 +14,3 @@ - name: Worker tasks include_tasks: worker.yml when: "not inventory_hostname == geth_primary" - - - name: Service tasks - include_tasks: services.yml diff --git a/roles/Geth/tasks/primary.yml b/roles/Geth/tasks/primary.yml index 3b36fc7..6463e55 100644 --- a/roles/Geth/tasks/primary.yml +++ b/roles/Geth/tasks/primary.yml @@ -15,3 +15,10 @@ - name: Ensure the token is in vault assert: that: k3s_token_cat.stdout_lines[0] is in secrets['Geth']['k3s_token'] + +- name: Enable k3s + become: yes + ansible.builtin.service: + name: k3s + state: restarted + enabled: yes diff --git a/roles/Geth/tasks/services.yml b/roles/Geth/tasks/services.yml deleted file mode 100644 index 3524c30..0000000 --- a/roles/Geth/tasks/services.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- - -- name: Enable k3s - become: yes - ansible.builtin.service: - name: k3s - state: restarted - enabled: yes diff --git a/roles/Geth/tasks/worker.yml b/roles/Geth/tasks/worker.yml index 6bf98c3..c599229 100644 --- a/roles/Geth/tasks/worker.yml +++ b/roles/Geth/tasks/worker.yml @@ -1,7 +1,14 @@ --- - - name: Set up primary + - name: Set up worker become: yes ansible.builtin.command: - cmd: '/bin/bash -c "K3S_TOKEN={{ secrets['Geth']['k3s_token'] }} K3S_URL=https://{{ geth_primary }}:6443 K3S_NODE_NAME=${HOSTNAME} /usr/local/sbin/get-k3s.sh"' - creates: /etc/systemd/system/k3s.service + cmd: /bin/bash -c "K3S_TOKEN={{ secrets['Geth']['k3s_token'] }} K3S_URL=https://{{ geth_primary }}:6443 K3S_NODE_NAME=${HOSTNAME} /usr/local/sbin/get-k3s.sh" + creates: /etc/systemd/system/k3s-agent.service + + - name: Enable k3s-agent + become: yes + ansible.builtin.service: + name: k3s-agent + state: restarted + enabled: yes