From 6ce1a66d3e5f2e82401127740b258a4f33cfdc43 Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Thu, 10 Nov 2022 15:03:11 +0100
Subject: [PATCH] Avoid latest Ansible version

---
 .../roles/metacluster/tasks/assets.yml             |  1 -
 .../files/ansible_payload/templates/registries.j2  | 14 ++++++++++----
 ansible/roles/os/vars/main.yml                     |  3 ++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/assets.yml b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/assets.yml
index a3522aa..69e9e12 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/assets.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/assets.yml
@@ -5,4 +5,3 @@
   loop: "{{ query('ansible.builtin.fileglob', '/opt/metacluster/container-images/*.tar') | sort }}"
   loop_control:
     label: "{{ item | basename }}"
-    pause: 30
diff --git a/ansible/roles/firstboot/files/ansible_payload/templates/registries.j2 b/ansible/roles/firstboot/files/ansible_payload/templates/registries.j2
index 59cb242..a07ddcd 100644
--- a/ansible/roles/firstboot/files/ansible_payload/templates/registries.j2
+++ b/ansible/roles/firstboot/files/ansible_payload/templates/registries.j2
@@ -9,17 +9,23 @@ mirrors:
       - https://registry.{{ vapp['metacluster.fqdn'] }}
     rewrite:
       "(.*)": "library/docker.io/$1"
+  gcr.io:
+    endpoint:
+      - https://registry.{{ vapp['metacluster.fqdn'] }}
+    rewrite:
+      "(.*)": "library/gcr.io/$1"
   ghcr.io:
     endpoint:
       - https://registry.{{ vapp['metacluster.fqdn'] }}
     rewrite:
       "(.*)": "library/ghcr.io/$1"
+  k8s.gcr.io:
+    endpoint:
+      - https://registry.{{ vapp['metacluster.fqdn'] }}
+    rewrite:
+      "(.*)": "library/k8s.gcr.io/$1"
   quay.io:
     endpoint:
       - https://registry.{{ vapp['metacluster.fqdn'] }}
     rewrite:
       "(.*)": "library/quay.io/$1"
-configs:
-  registry.{{ vapp['metacluster.fqdn'] }}:
-    tls:
-      insecure_skip_verify: true
diff --git a/ansible/roles/os/vars/main.yml b/ansible/roles/os/vars/main.yml
index c895247..79e5098 100644
--- a/ansible/roles/os/vars/main.yml
+++ b/ansible/roles/os/vars/main.yml
@@ -3,7 +3,8 @@ packages:
     - jq
     - python3-pip
   pip:
-    - ansible-core
+    # Some change causes high load during loops of importing/pushing container images
+    - ansible-core<2.14.0
     - jinja2
     - lxml
     - markupsafe