From bdc1da99d8350fa6efcea1e4cea760c7487fc061 Mon Sep 17 00:00:00 2001 From: David Kirwan Date: Thu, 5 Aug 2021 11:23:20 +0900 Subject: [PATCH] metrics-for-apps: hotfix installdevice for ocp4 workers Signed-off-by: David Kirwan --- inventory/host_vars/worker01.ocp.stg.iad2.fedoraproject.org | 2 +- inventory/host_vars/worker02.ocp.stg.iad2.fedoraproject.org | 2 +- inventory/host_vars/worker03.ocp.stg.iad2.fedoraproject.org | 2 +- playbooks/manual/templates/ocp_pxeboot.j2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inventory/host_vars/worker01.ocp.stg.iad2.fedoraproject.org b/inventory/host_vars/worker01.ocp.stg.iad2.fedoraproject.org index 8b8463e32e..6d13be4c2e 100644 --- a/inventory/host_vars/worker01.ocp.stg.iad2.fedoraproject.org +++ b/inventory/host_vars/worker01.ocp.stg.iad2.fedoraproject.org @@ -21,7 +21,7 @@ gw: "{{ eth0_ipv4_gw }}" dns: "{{ dns1 }}" pxe_bootdev: eno1 -install_dev: sda +install_dev: /dev/sda mac0: "68:05:CA:CE:A2:AC" rhcos_ignition_file_url: "http://10.3.166.50/rhcos/worker.ign" diff --git a/inventory/host_vars/worker02.ocp.stg.iad2.fedoraproject.org b/inventory/host_vars/worker02.ocp.stg.iad2.fedoraproject.org index d7bf9d056c..7afed58cff 100644 --- a/inventory/host_vars/worker02.ocp.stg.iad2.fedoraproject.org +++ b/inventory/host_vars/worker02.ocp.stg.iad2.fedoraproject.org @@ -21,7 +21,7 @@ gw: "{{ eth0_ipv4_gw }}" dns: "{{ dns1 }}" pxe_bootdev: eno1 -install_dev: sda +install_dev: /dev/sda mac0: "68:05:CA:CE:A3:24" rhcos_ignition_file_url: "http://10.3.166.50/rhcos/worker.ign" diff --git a/inventory/host_vars/worker03.ocp.stg.iad2.fedoraproject.org b/inventory/host_vars/worker03.ocp.stg.iad2.fedoraproject.org index aa40d78bc2..7f9fd0f461 100644 --- a/inventory/host_vars/worker03.ocp.stg.iad2.fedoraproject.org +++ b/inventory/host_vars/worker03.ocp.stg.iad2.fedoraproject.org @@ -21,7 +21,7 @@ gw: "{{ eth0_ipv4_gw }}" dns: "{{ dns1 }}" pxe_bootdev: eno1 -install_dev: sda +install_dev: /dev/sda mac0: "68:05:CA:CE:A5:10" rhcos_ignition_file_url: "http://10.3.166.50/rhcos/worker.ign" diff --git a/playbooks/manual/templates/ocp_pxeboot.j2 b/playbooks/manual/templates/ocp_pxeboot.j2 index 43db5366ef..323f9384d1 100644 --- a/playbooks/manual/templates/ocp_pxeboot.j2 +++ b/playbooks/manual/templates/ocp_pxeboot.j2 @@ -12,4 +12,4 @@ LABEL local LABEL {{ inventory_hostname}}-deploy MENU LABEL RHCOS {{ rhcos_version }} {{ arch }}- Kickstart for {{ inventory_hostname }} KERNEL rhcos/rhcos-{{ rhcos_version }}-{{ arch }}-live-kernel-{{ arch }} - APPEND ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:{{ pxe_bootdev }}:none nameserver={{ dns }} rd.neednet=1 initrd=rhcos/rhcos-{{ rhcos_version }}-{{ arch }}-live-initramfs.{{ arch }}.img console={{ kernel_console | default('tty0')}} coreos.inst=yes rd.md=1 rd.auto coreos.inst.install_dev={{ install_dev }} coreos.inst.image_url={{ rhcos_install_img_url }} coreos.inst.ignition_url={{ rhcos_ignition_file_url }} + APPEND ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:{{ pxe_bootdev }}:none nameserver={{ dns }} initrd=rhcos/rhcos-{{ rhcos_version }}-{{ arch }}-live-initramfs.{{ arch }}.img coreos.inst.install_dev={{ install_dev }} coreos.inst.image_url={{ rhcos_install_img_url }} coreos.inst.ignition_url={{ rhcos_ignition_file_url }}