From d3680e903a04385e70747704bf2ec674e426ff16 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 12 Jun 2025 14:45:10 -0700 Subject: [PATCH] openshift: fix image urls more, correct vm ips Signed-off-by: Kevin Fenzi --- inventory/host_vars/bootstrap.ocp.rdu3.fedoraproject.org | 4 ++-- inventory/host_vars/ocp01.ocp.rdu3.fedoraproject.org | 4 ++-- inventory/host_vars/ocp02.ocp.rdu3.fedoraproject.org | 4 ++-- inventory/host_vars/ocp03.ocp.rdu3.fedoraproject.org | 4 ++-- playbooks/manual/ocp4-place-ignitionfiles.yml | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/inventory/host_vars/bootstrap.ocp.rdu3.fedoraproject.org b/inventory/host_vars/bootstrap.ocp.rdu3.fedoraproject.org index 9a0bcbb821..22d18281d6 100644 --- a/inventory/host_vars/bootstrap.ocp.rdu3.fedoraproject.org +++ b/inventory/host_vars/bootstrap.ocp.rdu3.fedoraproject.org @@ -6,7 +6,7 @@ dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search3: "fedoraproject.org" eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.16.163.126 +eth0_ipv4_ip: 10.16.163.126 eth0_ipv4_gw: 10.16.163.254 freezes: false gw: "{{ eth0_ipv4_gw }}" @@ -19,7 +19,7 @@ network_connections: - autoconnect: yes ip: address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" + - "{{ eth0_ipv4_ip }}/{{ eth0_ipv4_nm }}" dhcp4: no dns: - "{{ dns1 }}" diff --git a/inventory/host_vars/ocp01.ocp.rdu3.fedoraproject.org b/inventory/host_vars/ocp01.ocp.rdu3.fedoraproject.org index 7e0e9125b4..2c354e3976 100644 --- a/inventory/host_vars/ocp01.ocp.rdu3.fedoraproject.org +++ b/inventory/host_vars/ocp01.ocp.rdu3.fedoraproject.org @@ -6,7 +6,7 @@ dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search3: "fedoraproject.org" eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.16.163.120 +eth0_ipv4_ip: 10.16.163.120 eth0_ipv4_gw: 10.16.163.254 freezes: false gw: "{{ eth0_ipv4_gw }}" @@ -19,7 +19,7 @@ network_connections: - autoconnect: yes ip: address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" + - "{{ eth0_ipv4_ip }}/{{ eth0_ipv4_nm }}" dhcp4: no dns: - "{{ dns1 }}" diff --git a/inventory/host_vars/ocp02.ocp.rdu3.fedoraproject.org b/inventory/host_vars/ocp02.ocp.rdu3.fedoraproject.org index 3ee0ec8d0e..aa171adc03 100644 --- a/inventory/host_vars/ocp02.ocp.rdu3.fedoraproject.org +++ b/inventory/host_vars/ocp02.ocp.rdu3.fedoraproject.org @@ -6,7 +6,7 @@ dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search3: "fedoraproject.org" eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.16.163.121 +eth0_ipv4_ip: 10.16.163.121 eth0_ipv4_gw: 10.16.163.254 freezes: false gw: "{{ eth0_ipv4_gw }}" @@ -19,7 +19,7 @@ network_connections: - autoconnect: yes ip: address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" + - "{{ eth0_ipv4_ip }}/{{ eth0_ipv4_nm }}" dhcp4: no dns: - "{{ dns1 }}" diff --git a/inventory/host_vars/ocp03.ocp.rdu3.fedoraproject.org b/inventory/host_vars/ocp03.ocp.rdu3.fedoraproject.org index dc631df8a5..f28ab5b15e 100644 --- a/inventory/host_vars/ocp03.ocp.rdu3.fedoraproject.org +++ b/inventory/host_vars/ocp03.ocp.rdu3.fedoraproject.org @@ -6,7 +6,7 @@ dns2: 10.16.163.34 dns_search1: "rdu3.fedoraproject.org" dns_search3: "fedoraproject.org" eth0_ip: "{{eth0_ipv4}}" -eth0_ipv4: 10.16.163.122 +eth0_ipv4_ip: 10.16.163.122 eth0_ipv4_gw: 10.16.163.254 freezes: false gw: "{{ eth0_ipv4_gw }}" @@ -19,7 +19,7 @@ network_connections: - autoconnect: yes ip: address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" + - "{{ eth0_ipv4_ip }}/{{ eth0_ipv4_nm }}" dhcp4: no dns: - "{{ dns1 }}" diff --git a/playbooks/manual/ocp4-place-ignitionfiles.yml b/playbooks/manual/ocp4-place-ignitionfiles.yml index 60542cb2bd..97f5f17598 100644 --- a/playbooks/manual/ocp4-place-ignitionfiles.yml +++ b/playbooks/manual/ocp4-place-ignitionfiles.yml @@ -53,10 +53,10 @@ # run_once: true ignore_errors: true with_items: - - "rhcos-{{ rhcos_version }}-x86_64-live-initramfs.x86_64.img" - - "rhcos-{{ rhcos_version }}-x86_64-live-rootfs.x86_64.img" - - "rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz" - - "rhcos-{{ rhcos_version }}-x86_64-live-kernel-x86_64" + - "rhcos-live-initramfs.x86_64.img" + - "rhcos-live-rootfs.x86_64.img" + - "rhcos-metal.x86_64.raw.gz" + - "rhcos-live-kernel-x86_64" - name: == OCP KVM provisioning == Ensuring symlink for correct version {{ rhcos_version }} ansible.builtin.file: state: link