From 76b4d96da551c22aee6cae2e97944669a3d1cabc Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <allanger@badhouseplants.net>
Date: Tue, 2 Apr 2024 13:13:13 +0200
Subject: [PATCH] Fix k3s collection installation

---
 playbooks/systems/k3s-bootstrap/playbook.yml | 6 +++---
 requirements.yml                             | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/playbooks/systems/k3s-bootstrap/playbook.yml b/playbooks/systems/k3s-bootstrap/playbook.yml
index 1d692c3..194a29f 100644
--- a/playbooks/systems/k3s-bootstrap/playbook.yml
+++ b/playbooks/systems/k3s-bootstrap/playbook.yml
@@ -5,18 +5,18 @@
   gather_facts: true
   become: true
   roles:
-    - role: ./.ansible/roles/k3s-ansible/roles/prereq
+    - role: k3s.orchestration.prereq
 
 - name: Setup K3S server
   hosts: server
   remote_user: admin
   become: true
   roles:
-    - role: ./.ansible/roles/k3s-ansible/roles/k3s_server
+    - role: k3s.orchestration.k3s_server
 
 - name: Setup K3S agent
   hosts: agent
   remote_user: admin
   become: true
   roles:
-    - role: ./.ansible/roles/k3s-ansible/roles/k3s_agent
+    - role: k3s.orchestration.k3s_agent
diff --git a/requirements.yml b/requirements.yml
index 8e4d0aa..e4acfd8 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -7,9 +7,10 @@ collections:
     version: 8.5.0
   - name: ansible.posix
   - name: kubernetes.core
-roles:
-  - src: git+https://git.badhouseplants.net/allanger/k3s-ansible.git
+  - name: git+https://git.badhouseplants.net/allanger/k3s-ansible.git
+    type: git
     version: master
+roles:
   - src: git+https://git.badhouseplants.net/allanger/ansible-create-k8s-user.git
     version: download-config
   - xanmanning.k3s