From 46628aa32410451f96f63f36b68302e871e89094 Mon Sep 17 00:00:00 2001
From: rblundon <ryan.blundon@protonmail.com>
Date: Sun, 23 Mar 2025 01:56:48 -0500
Subject: [PATCH] moved vars

---
 .../03-openshift-image/move-pxe-assets.yml     |  4 ++--
 group_vars/all/vars                            | 18 ------------------
 group_vars/freeipa/vars                        |  3 +++
 group_vars/matchbox/vars                       |  9 +++++++++
 4 files changed, 14 insertions(+), 20 deletions(-)
 create mode 100644 group_vars/freeipa/vars
 create mode 100644 group_vars/matchbox/vars

diff --git a/10-sno-hub-cluster/03-openshift-image/move-pxe-assets.yml b/10-sno-hub-cluster/03-openshift-image/move-pxe-assets.yml
index 5ba21be..1bbfbfd 100644
--- a/10-sno-hub-cluster/03-openshift-image/move-pxe-assets.yml
+++ b/10-sno-hub-cluster/03-openshift-image/move-pxe-assets.yml
@@ -1,7 +1,7 @@
 ---
 - name: Create a directory if it does not exist
   ansible.builtin.file:
-    path: "{{ matchbox_assets }}/{{ hub_cluster_name }}"
+    path: "{{ matchbox_assets }}/{{ hostvars['ocp-hub'].cluster_name }}"
     state: directory
     mode: '0755'
   become: true
@@ -9,7 +9,7 @@
 - name: Copy file with owner and permissions
   ansible.builtin.copy:
     src: 03-openshift-image/boot-artifacts/
-    dest: "{{ matchbox_assets }}/{{ hub_cluster_name }}/"
+    dest: "{{ matchbox_assets }}/{{ hostvars['ocp-hub'].cluster_name }}/"
     owner: matchbox
     group: matchbox
   become: true
diff --git a/group_vars/all/vars b/group_vars/all/vars
index 96c5de2..ed97d53 100644
--- a/group_vars/all/vars
+++ b/group_vars/all/vars
@@ -1,19 +1 @@
 ---
-# Variables for Free-IPA
-freeipa_user: "admin"
-freeipa_password: "{{ vault_freeipa_password }}"
-
-# Variables for Matchbox
-matchbox_assets: "/var/lib/matchbox/assets"
-matchbox_http_endpoint: "http://matchbox.int.mk-labs.cloud:8080"
-matchbox_rpc_endpoint: "matchbox.int.mk-labs.cloud:8081"
-
-# Variables for OpenShift Installer
-openshift_installer_pull_secret: "{{ vault_pull_secret }}"
-openshift_installer_ssh_key: "{{ vault_ssh_key }}"
-
-# # Variables for 10-sno-hub-cluster
-# hub_cluster_mac_address: "98:b7:85:1e:c6:f1"
-# hub_cluster_ip_address: "10.1.71.10"
-# hub_cluster_hostname: "ocp-hub"
-# hub_cluster_name: "hub"
diff --git a/group_vars/freeipa/vars b/group_vars/freeipa/vars
new file mode 100644
index 0000000..d9ddd8f
--- /dev/null
+++ b/group_vars/freeipa/vars
@@ -0,0 +1,3 @@
+---
+freeipa_user: "admin"
+freeipa_password: "{{ vault_freeipa_password }}"
diff --git a/group_vars/matchbox/vars b/group_vars/matchbox/vars
new file mode 100644
index 0000000..dec570c
--- /dev/null
+++ b/group_vars/matchbox/vars
@@ -0,0 +1,9 @@
+---
+# Variables for Matchbox
+matchbox_assets: "/var/lib/matchbox/assets"
+matchbox_http_endpoint: "http://matchbox.int.mk-labs.cloud:8080"
+matchbox_rpc_endpoint: "matchbox.int.mk-labs.cloud:8081"
+
+# Variables for OpenShift Installer
+openshift_installer_pull_secret: "{{ vault_pull_secret }}"
+openshift_installer_ssh_key: "{{ vault_ssh_key }}"