Update FCOS iPXE initrd and kernel arg settings
* Add initrd=main kernel argument for UEFI * Switch to using the coreos.live.rootfs_url kernel argument instead of passing the rootfs as an appended initrd * Remove coreos.inst.image_url kernel argument since coreos-installer now defaults to installing from the embedded live system * Remove rd.neednet=1 and dhcp=ip kernel args that aren't needed * Remove serial console kernel args by default (these can be added via var.kernel_args if needed) Rel: * https://github.com/poseidon/matchbox/pull/972 (thank you @bgilbert) * https://github.com/poseidon/matchbox/pull/978
This commit is contained in:
parent
6a9c32d3a9
commit
de6f27e119
|
@ -229,7 +229,6 @@ storage:
|
||||||
ETCD_PEER_CERT_FILE=/etc/ssl/certs/etcd/peer.crt
|
ETCD_PEER_CERT_FILE=/etc/ssl/certs/etcd/peer.crt
|
||||||
ETCD_PEER_KEY_FILE=/etc/ssl/certs/etcd/peer.key
|
ETCD_PEER_KEY_FILE=/etc/ssl/certs/etcd/peer.key
|
||||||
ETCD_PEER_CLIENT_CERT_AUTH=true
|
ETCD_PEER_CLIENT_CERT_AUTH=true
|
||||||
- path: /etc/fedora-coreos/iptables-legacy.stamp
|
|
||||||
- path: /etc/containerd/config.toml
|
- path: /etc/containerd/config.toml
|
||||||
overwrite: true
|
overwrite: true
|
||||||
contents:
|
contents:
|
||||||
|
|
|
@ -127,7 +127,6 @@ storage:
|
||||||
DefaultCPUAccounting=yes
|
DefaultCPUAccounting=yes
|
||||||
DefaultMemoryAccounting=yes
|
DefaultMemoryAccounting=yes
|
||||||
DefaultBlockIOAccounting=yes
|
DefaultBlockIOAccounting=yes
|
||||||
- path: /etc/fedora-coreos/iptables-legacy.stamp
|
|
||||||
- path: /etc/containerd/config.toml
|
- path: /etc/containerd/config.toml
|
||||||
overwrite: true
|
overwrite: true
|
||||||
contents:
|
contents:
|
||||||
|
|
|
@ -1,34 +1,26 @@
|
||||||
locals {
|
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_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 = [
|
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",
|
"--name main 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_args = [
|
remote_args = [
|
||||||
"ip=dhcp",
|
"initrd=main",
|
||||||
"rd.neednet=1",
|
"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.install_dev=${var.install_disk}",
|
"coreos.inst.install_dev=${var.install_disk}",
|
||||||
"coreos.inst.ignition_url=${var.matchbox_http_endpoint}/ignition?uuid=$${uuid}&mac=$${mac:hexhyp}",
|
"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",
|
|
||||||
"console=ttyS0",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
cached_kernel = "/assets/fedora-coreos/fedora-coreos-${var.os_version}-live-kernel-x86_64"
|
cached_kernel = "/assets/fedora-coreos/fedora-coreos-${var.os_version}-live-kernel-x86_64"
|
||||||
cached_initrd = [
|
cached_initrd = [
|
||||||
"/assets/fedora-coreos/fedora-coreos-${var.os_version}-live-initramfs.x86_64.img",
|
"/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_args = [
|
cached_args = [
|
||||||
"ip=dhcp",
|
"initrd=main",
|
||||||
"rd.neednet=1",
|
"coreos.live.rootfs_url=${var.matchbox_http_endpoint}/assets/fedora-coreos/fedora-coreos-${var.os_version}-live-rootfs.x86_64.img",
|
||||||
"coreos.inst.install_dev=${var.install_disk}",
|
"coreos.inst.install_dev=${var.install_disk}",
|
||||||
"coreos.inst.ignition_url=${var.matchbox_http_endpoint}/ignition?uuid=$${uuid}&mac=$${mac:hexhyp}",
|
"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",
|
|
||||||
"console=ttyS0",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
kernel = var.cached_install ? local.cached_kernel : local.remote_kernel
|
kernel = var.cached_install ? local.cached_kernel : local.remote_kernel
|
||||||
|
|
|
@ -18,8 +18,6 @@ resource "matchbox_profile" "flatcar-install" {
|
||||||
"initrd=flatcar_production_pxe_image.cpio.gz",
|
"initrd=flatcar_production_pxe_image.cpio.gz",
|
||||||
"flatcar.config.url=${var.matchbox_http_endpoint}/ignition?uuid=$${uuid}&mac=$${mac:hexhyp}",
|
"flatcar.config.url=${var.matchbox_http_endpoint}/ignition?uuid=$${uuid}&mac=$${mac:hexhyp}",
|
||||||
"flatcar.first_boot=yes",
|
"flatcar.first_boot=yes",
|
||||||
"console=tty0",
|
|
||||||
"console=ttyS0",
|
|
||||||
var.kernel_args,
|
var.kernel_args,
|
||||||
])
|
])
|
||||||
|
|
||||||
|
@ -42,8 +40,6 @@ resource "matchbox_profile" "cached-flatcar-install" {
|
||||||
"initrd=flatcar_production_pxe_image.cpio.gz",
|
"initrd=flatcar_production_pxe_image.cpio.gz",
|
||||||
"flatcar.config.url=${var.matchbox_http_endpoint}/ignition?uuid=$${uuid}&mac=$${mac:hexhyp}",
|
"flatcar.config.url=${var.matchbox_http_endpoint}/ignition?uuid=$${uuid}&mac=$${mac:hexhyp}",
|
||||||
"flatcar.first_boot=yes",
|
"flatcar.first_boot=yes",
|
||||||
"console=tty0",
|
|
||||||
"console=ttyS0",
|
|
||||||
var.kernel_args,
|
var.kernel_args,
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue