From aad6d4739f9e415598397446073bac55faf74d28 Mon Sep 17 00:00:00 2001
From: Michele Costa <mtcosta@protonmail.com>
Date: Mon, 30 Jan 2023 20:18:28 +0000
Subject: [PATCH] Fix change to iso name

---
 roles/generate_agent_iso/tasks/main.yml    | 7 ++++++-
 roles/validate_inventory/defaults/main.yml | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/roles/generate_agent_iso/tasks/main.yml b/roles/generate_agent_iso/tasks/main.yml
index 1748037d..5f496da1 100644
--- a/roles/generate_agent_iso/tasks/main.yml
+++ b/roles/generate_agent_iso/tasks/main.yml
@@ -46,6 +46,11 @@
         - infraenv.yaml
         - nmstateconfig.yaml
 
+    - name: Remove agent-config.yml
+      file:
+        path: "{{ cluster_manifest_parent_dir }}/agent-config.yaml"
+        state: absent
+
     - name: Generate ISO with agent-config
       ansible.builtin.shell:
         cmd: "{{ agent_based_installer_path }} --log-level=debug agent create image"
@@ -61,7 +66,7 @@
 
     - name: Copy agent iso to discovery directory
       ansible.builtin.copy:
-        src: "{{ cluster_manifest_parent_dir }}/agent.iso"
+        src: "{{ cluster_manifest_parent_dir }}/agent.{{ arch | default('x86_64') }}.iso"
         dest: "{{ download_dest_path }}/{{ download_agent_dest_file }}"
         mode: 0644
   delegate_to: http_store
diff --git a/roles/validate_inventory/defaults/main.yml b/roles/validate_inventory/defaults/main.yml
index 28061978..86be589c 100644
--- a/roles/validate_inventory/defaults/main.yml
+++ b/roles/validate_inventory/defaults/main.yml
@@ -30,5 +30,6 @@ supported_ocp_versions:
 - 4.9.45
 - 4.10.37
 - 4.11.24
+- 4.12.0
 
 single_node_openshift_enabled: "{{ is_valid_single_node_openshift_config | default(false) }}"