From 6c0d599c0edeb3b42a9d8d1abefafcf51292f50e Mon Sep 17 00:00:00 2001 From: rblundon Date: Sat, 22 Mar 2025 23:54:24 -0500 Subject: [PATCH] Update inventory and matchbox configuration --- .../03-matchbox/create-openshift-image.yml | 8 +++----- 10-sno-hub-cluster/03-matchbox/groups.tf | 2 +- 10-sno-hub-cluster/install.yml | 2 +- group_vars/all/vars | 1 - inventory.yml | 15 +++++++++++++-- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/10-sno-hub-cluster/03-matchbox/create-openshift-image.yml b/10-sno-hub-cluster/03-matchbox/create-openshift-image.yml index bce4fae..575eb00 100644 --- a/10-sno-hub-cluster/03-matchbox/create-openshift-image.yml +++ b/10-sno-hub-cluster/03-matchbox/create-openshift-image.yml @@ -1,7 +1,5 @@ --- - name: OpenShift image creation - ansible.builtin.command: - cmd: /usr/local/bin/openshift-install agent create pxe-files - chdir: 03-matchbox - register: command_result - ignore_errors: yes + ansible.builtin.command: /usr/local/bin/openshift-install agent create pxe-files + args: + chdir: 03-matchbox diff --git a/10-sno-hub-cluster/03-matchbox/groups.tf b/10-sno-hub-cluster/03-matchbox/groups.tf index 2727400..a550ed1 100644 --- a/10-sno-hub-cluster/03-matchbox/groups.tf +++ b/10-sno-hub-cluster/03-matchbox/groups.tf @@ -1,7 +1,7 @@ // Matcher group for OCP Internal machinesmachines resource "matchbox_group" "ocp-hub" { name = "ocp-hub" # Physical Server - profile = matchbox_profile.hub.name + profile = matchbox_profile.openshift-agent-install.name selector = { mac = "98:b7:85:1e:c6:f1" # PXE boots and installs to 10GbE NIC } diff --git a/10-sno-hub-cluster/install.yml b/10-sno-hub-cluster/install.yml index 4e22a79..019ed4c 100644 --- a/10-sno-hub-cluster/install.yml +++ b/10-sno-hub-cluster/install.yml @@ -1,6 +1,6 @@ --- - name: Run all tasks necessary to configure matchbox to install the cluster - hosts: 127.0.0.1 + hosts: matchbox connection: local gather_facts: true diff --git a/group_vars/all/vars b/group_vars/all/vars index 6f0f40d..3cc7426 100644 --- a/group_vars/all/vars +++ b/group_vars/all/vars @@ -6,7 +6,6 @@ freeipa_password: "{{ vault_freeipa_password }}" # Variables for Matchbox matchbox_assets: "/var/lib/matchbox/assets" - # Variables for 10-sno-hub-cluster mac_address: "98:b7:85:1e:c6:f1" ip_address: "10.1.71.10" diff --git a/inventory.yml b/inventory.yml index 1ad37c3..a6135f3 100644 --- a/inventory.yml +++ b/inventory.yml @@ -1,2 +1,13 @@ -[default] -localhost +proxmox: + hosts: + pve01: + pve02: + pve03: + +freeipa: + hosts: + infra01: + +matchbox: + hosts: + infra01: