From ed7a474dbbd3a04b3b25d0f240cb268e0b85b334 Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Sun, 31 Jul 2022 18:17:13 +0200
Subject: [PATCH] Update vApp properties;Rebase static binary;Refactor
 dictionary;Combine similar steps;Housekeeping

---
 .../ansible_payload/roles/metacluster/tasks/main.yml |  2 +-
 ansible/roles/metacluster/tasks/config.yml           | 11 -----------
 ansible/roles/metacluster/tasks/main.yml             |  5 +----
 ansible/roles/metacluster/tasks/staging.yml          |  9 ++++++++-
 ansible/vars/metacluster.yml                         | 10 +++++-----
 scripts/Update-OvfConfiguration.yml                  | 12 ++++++------
 6 files changed, 21 insertions(+), 28 deletions(-)
 delete mode 100644 ansible/roles/metacluster/tasks/config.yml

diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml
index 73a994d..ab7808f 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml
@@ -277,7 +277,7 @@
           ansible.builtin.shell:
             cmd: |
               git config --local http.sslVerify false
-              git remote set-url origin https://administrator:{{ vapp['guestinfo.rootpw'] | urlencode }}@git.{{ vapp['metacluster.fqdn']}}/mc/GitOps.Config.git
+              git remote set-url origin https://administrator:{{ vapp['guestinfo.rootpw'] | urlencode }}@git.{{ vapp['metacluster.fqdn'] }}/mc/GitOps.Config.git
               git push
             chdir: /opt/metacluster/git-repositories/gitops
 
diff --git a/ansible/roles/metacluster/tasks/config.yml b/ansible/roles/metacluster/tasks/config.yml
deleted file mode 100644
index b48d32e..0000000
--- a/ansible/roles/metacluster/tasks/config.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- name: Create folder structure(s)
-  ansible.builtin.file:
-    path: "{{ item }}"
-    state: directory
-  loop:
-    - /opt/metacluster/git-repositories/gitops
-
-- name: Clone git repository
-  ansible.builtin.git:
-    repo: https://code.spamasaurus.com/djpbessems/GitOps.MetaCluster.git
-    dest: /opt/metacluster/git-repositories/gitops
diff --git a/ansible/roles/metacluster/tasks/main.yml b/ansible/roles/metacluster/tasks/main.yml
index 81d2a4c..164213b 100644
--- a/ansible/roles/metacluster/tasks/main.yml
+++ b/ansible/roles/metacluster/tasks/main.yml
@@ -4,10 +4,7 @@
 - name: Pre-stage meta-cluster components
   import_tasks: components.yml
 
-- name: Pre-stage IaC repositories
-  import_tasks: config.yml
-
-- name: Pre-stage workload-cluster components
+- name: Pre-stage meta-cluster configuration and workload-cluster components
   import_tasks: staging.yml
 
 - name: Cleanup
diff --git a/ansible/roles/metacluster/tasks/staging.yml b/ansible/roles/metacluster/tasks/staging.yml
index 4c32463..64a7af8 100644
--- a/ansible/roles/metacluster/tasks/staging.yml
+++ b/ansible/roles/metacluster/tasks/staging.yml
@@ -3,9 +3,16 @@
     path: "{{ item }}"
     state: directory
   loop:
+    - /opt/metacluster/git-repositories/gitops
     - /opt/workloadcluster/node-templates
 
-- name: Download images
+- name: Clone git repository
+  ansible.builtin.git:
+    repo: "{{ platform.gitops.repository.uri }}"
+    version: "{{ platform.gitops.repository.revision }}"
+    dest: /opt/metacluster/git-repositories/gitops
+
+- name: Download node-template images
   ansible.builtin.uri:
     url: "{{ item.url }}"
     dest: /opt/workloadcluster/node-templates/{{ item.name }}
diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml
index df1142c..967a1ed 100644
--- a/ansible/vars/metacluster.yml
+++ b/ansible/vars/metacluster.yml
@@ -4,8 +4,10 @@ platform:
     version: v1.24.1+k3s1
 
   gitops:
-    # repo_ref: v0.1
-    repo_ref: HEAD
+    repository:
+      uri: https://code.spamasaurus.com/djpbessems/GitOps.MetaCluster.git
+      # revision: v0.1.0
+      revision: HEAD
 
   packaged_components:
     - name: traefik
@@ -139,9 +141,7 @@ dependencies:
       archive: compressed
       extra_opts: --strip-components=1
     - filename: skopeo
-      url: https://sn.itch.fyi/Repository/rel/skopeo
-      username: "{{ repo_username }}"
-      password: "{{ repo_password }}"
+      url: https://code.spamasaurus.com/api/packages/djpbessems/generic/skopeo/v1.9.1/skopeo
     - filename: yq
       url: http://github.com/mikefarah/yq/releases/download/v4.25.3/yq_linux_amd64
 
diff --git a/scripts/Update-OvfConfiguration.yml b/scripts/Update-OvfConfiguration.yml
index b14dab2..f52ebeb 100644
--- a/scripts/Update-OvfConfiguration.yml
+++ b/scripts/Update-OvfConfiguration.yml
@@ -119,24 +119,24 @@ PropertyCategories:
 
   - Key: hv.fqdn
     Type: string(1..)
-    Label: vCenter Appliance FQDN*
-    Description: ''
+    Label: vCenter FQDN/IP-address*
+    Description: 'The address of the vCenter instance which this bootstrap appliance will interact with for provisioning new VM's.'
     DefaultValue: ''
     Configurations: '*'
     UserConfigurable: true
 
   - Key: hv.username
     Type: string(1..)
-    Label: User name ...*
-    Description: ''
+    Label: vCenter username*
+    Description: 'The username which this bootstrap appliance will authenticate with to the vCenter instance.'
     DefaultValue: ''
     Configurations: '*'
     UserConfigurable: true
 
   - Key: hv.password
     Type: password(1..)
-    Label: Password ...*
-    Description: ''
+    Label: vCenter password ...*
+    Description: 'The password which this bootstrap appliance will authenticate with to the vCenter instance.'
     DefaultValue: ''
     Configurations: '*'
     UserConfigurable: true