From 6742a1645903c99fd8b0e606ad3a3149aae6a42c Mon Sep 17 00:00:00 2001
From: Lars Fenneberg <lf@elemental.net>
Date: Mon, 8 Mar 2021 15:51:24 +0100
Subject: [PATCH] Use alternate way to specify and load the root fs

The way that upstream has chosen doesn't work with the HP
servers, even though it works fine an the master desktop
nodes and the development cluster.

See https://docs.fedoraproject.org/en-US/fedora-coreos/live-booting-ipxe/#_pxe_images
and https://github.com/coreos/fedora-coreos-tracker/issues/390.
---
 bare-metal/fedora-coreos/kubernetes/profiles.tf | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/bare-metal/fedora-coreos/kubernetes/profiles.tf b/bare-metal/fedora-coreos/kubernetes/profiles.tf
index 25593242a..cfad837f1 100644
--- a/bare-metal/fedora-coreos/kubernetes/profiles.tf
+++ b/bare-metal/fedora-coreos/kubernetes/profiles.tf
@@ -1,13 +1,12 @@
 locals {
   remote_kernel = "https://builds.coreos.fedoraproject.org/prod/streams/${var.os_stream}/builds/${var.os_version}/x86_64/fedora-coreos-${var.os_version}-live-kernel-x86_64"
-  remote_initrd = [
-    "https://builds.coreos.fedoraproject.org/prod/streams/${var.os_stream}/builds/${var.os_version}/x86_64/fedora-coreos-${var.os_version}-live-initramfs.x86_64.img",
-    "https://builds.coreos.fedoraproject.org/prod/streams/${var.os_stream}/builds/${var.os_version}/x86_64/fedora-coreos-${var.os_version}-live-rootfs.x86_64.img"
-  ]
+  remote_initrd = ["https://builds.coreos.fedoraproject.org/prod/streams/${var.os_stream}/builds/${var.os_version}/x86_64/fedora-coreos-${var.os_version}-live-initramfs.x86_64.img"]
 
   remote_args = [
     "ip=dhcp",
     "rd.neednet=1",
+    "initrd=fedora-coreos-${var.os_version}-live-initramfs.x86_64.img",
+    "coreos.live.rootfs_url=https://builds.coreos.fedoraproject.org/prod/streams/${var.os_stream}/builds/${var.os_version}/x86_64/fedora-coreos-${var.os_version}-live-rootfs.x86_64.img",
     "coreos.inst.ignition_url=${var.matchbox_http_endpoint}/ignition?uuid=$${uuid}&mac=$${mac:hexhyp}",
     "coreos.inst.image_url=https://builds.coreos.fedoraproject.org/prod/streams/${var.os_stream}/builds/${var.os_version}/x86_64/fedora-coreos-${var.os_version}-metal.x86_64.raw.xz",
     "console=tty0",
@@ -15,14 +14,13 @@ locals {
   ]
 
   cached_kernel = "/assets/fedora-coreos/fedora-coreos-${var.os_version}-live-kernel-x86_64"
-  cached_initrd = [
-    "/assets/fedora-coreos/fedora-coreos-${var.os_version}-live-initramfs.x86_64.img",
-    "/assets/fedora-coreos/fedora-coreos-${var.os_version}-live-rootfs.x86_64.img"
-  ]
+  cached_initrd = ["/assets/fedora-coreos/fedora-coreos-${var.os_version}-live-initramfs.x86_64.img"]
 
   cached_args = [
     "ip=dhcp",
     "rd.neednet=1",
+    "initrd=fedora-coreos-${var.os_version}-live-initramfs.x86_64.img",
+    "coreos.live.rootfs_url=${var.matchbox_http_endpoint}/assets/fedora-coreos/fedora-coreos-${var.os_version}-live-rootfs.x86_64.img",
     "coreos.inst.ignition_url=${var.matchbox_http_endpoint}/ignition?uuid=$${uuid}&mac=$${mac:hexhyp}",
     "coreos.inst.image_url=${var.matchbox_http_endpoint}/assets/fedora-coreos/fedora-coreos-${var.os_version}-metal.x86_64.raw.xz",
     "console=tty0",