diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 99ae948..ed0527b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,7 +17,7 @@ repos: hooks: - id: reorder-python-imports - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.9.5 + rev: v0.9.7 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] diff --git a/inventory.py b/inventory.py index 503684e..8e4c381 100644 --- a/inventory.py +++ b/inventory.py @@ -20,54 +20,60 @@ servers = [ kropcloud = [ ( - "k3s-node0", { - "ssh_user": "root", - "ssh_hostname": "192.168.1.190", - "tailscale": False, - "k3s": { - "role": "master", - "token": "1mN0tv3r1!s3cur3Bu1?T3s0Nl#", - }, - }, - ), - ( - "k3s-node1", { - "ssh_user": "root", - "ssh_hostname": "192.168.1.191", - "tailscale": False, - "k3s": { - "role": "worker", - "master": "192.168.1.190", - "token": "1mN0tv3r1!s3cur3Bu1?T3s0Nl#", - }, - }, - ), - ( - "k3s-node2", { - "ssh_user": "root", - "ssh_hostname": "192.168.1.192", - "tailscale": False, - "k3s": { - "role": "worker", - "master": "192.168.1.190", - "token": "1mN0tv3r1!s3cur3Bu1?T3s0Nl#", - }, - }, - ), - ( - "k3s-nfs", { - "ssh_user": "root", - "ssh_hostname": "192.168.1.195", - "tailscale": False, - "nfs": { - "exports": [ - { - "directory": "/mnt/nas", - "ip": "192.168.1.0/24", - "flags": ["rw","sync","no_wdelay","no_root_squash","insecure","no_subtree_check"], - }, - ], - }, + "dev-server", { + "ssh_user": "krop", + "ssh_hostname": "192.168.1.151", }, ), + # ( + # "k3s-node0", { + # "ssh_user": "root", + # "ssh_hostname": "192.168.1.190", + # "tailscale": False, + # "k3s": { + # "role": "master", + # "token": "1mN0tv3r1!s3cur3Bu1?T3s0Nl#", + # }, + # }, + # ), + # ( + # "k3s-node1", { + # "ssh_user": "root", + # "ssh_hostname": "192.168.1.191", + # "tailscale": False, + # "k3s": { + # "role": "worker", + # "master": "192.168.1.190", + # "token": "1mN0tv3r1!s3cur3Bu1?T3s0Nl#", + # }, + # }, + # ), + # ( + # "k3s-node2", { + # "ssh_user": "root", + # "ssh_hostname": "192.168.1.192", + # "tailscale": False, + # "k3s": { + # "role": "worker", + # "master": "192.168.1.190", + # "token": "1mN0tv3r1!s3cur3Bu1?T3s0Nl#", + # }, + # }, + # ), + # ( + # "k3s-nfs", { + # "ssh_user": "root", + # "ssh_hostname": "192.168.1.195", + # "tailscale": False, + # "nfs": { + # "exports": [ + # { + # "directory": "/mnt/nas", + # "ip": "192.168.1.0/24", + # "flags": ["rw","sync","no_wdelay","no_root_squash","insecure","no_subtree_check"], + # }, + # ], + # }, + # }, + # ), ] diff --git a/tasks/k3s.py b/tasks/k3s.py index d380276..eb2c53f 100644 --- a/tasks/k3s.py +++ b/tasks/k3s.py @@ -12,7 +12,7 @@ def deploy_k3s(): k3s_config = host.data.get("k3s") if not k3s_config: - raise ValueError("k3s ") + raise ValueError("k3s config not found") server.shell( name="Disable ufw",