From 570047df3b4035d6ca833712803e38f6a75b1a61 Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Sat, 1 Apr 2023 13:43:36 +0200
Subject: [PATCH] Fix target paths;Add git repositories

---
 .../bootstrap/roles/metacluster/tasks/git.yml  | 18 ++++++++++++------
 .../roles/workloadcluster/tasks/clusterapi.yml |  4 ++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/git.yml b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/git.yml
index 34aae1b..2b2dfe6 100644
--- a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/git.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/git.yml
@@ -107,18 +107,24 @@
               Authorization: token {{ gitea_api_token.json.sha1 }}
             body: "{{ item.body }}"
           loop:
-            - organization: mc
-              body:
-                name: GitOps.HelmCharts
-                # auto_init: true
-                # default_branch: main
-                description: Helm charts
             - organization: mc
               body:
                 name: GitOps.ClusterAPI
                 # auto_init: true
                 # default_branch: main
                 description: ClusterAPI manifests
+            - organization: mc
+              body:
+                name: GitOps.Config
+                # auto_init: true
+                # default_branch: main
+                description: GitOps manifests
+            - organization: mc
+              body:
+                name: GitOps.HelmCharts
+                # auto_init: true
+                # default_branch: main
+                description: Helm charts
             - organization: wl
               body:
                 name: GitOps.Config
diff --git a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/clusterapi.yml b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/clusterapi.yml
index 5ed2c42..1196177 100644
--- a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/clusterapi.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/clusterapi.yml
@@ -144,14 +144,14 @@
 
 - name: Save workload cluster manifest
   ansible.builtin.copy:
-    dest: "{{ capi_clustermanifest.path }}"
+    dest: "{{ capi_clustermanifest.path }}/new-cluster.yaml"
     content: "{{ clusterctl_newcluster.stdout }}"
 
 - name: Split manifest into separate files
   ansible.builtin.shell:
     cmd: >-
       kubectl slice \
-        -f {{ capi_clustermanifest.path }} \
+        -f {{ capi_clustermanifest.path }}/new-cluster.yaml \
         -o {{ capi_clustermanifest.path }}/manifests
 
 - name: Initialize/Push git repository