Allow setting custom PXE boot kernel_args on bare-metal

This commit is contained in:
bzub 2017-10-02 11:47:44 -05:00 committed by Dalton Hubble
parent 7b5ffd0085
commit e765fb310d
4 changed files with 20 additions and 2 deletions

View File

@ -12,6 +12,7 @@ resource "matchbox_profile" "container-linux-install" {
"coreos.first_boot=yes", "coreos.first_boot=yes",
"console=tty0", "console=tty0",
"console=ttyS0", "console=ttyS0",
"${var.kernel_args}",
] ]
container_linux_config = "${data.template_file.container-linux-install-config.rendered}" container_linux_config = "${data.template_file.container-linux-install-config.rendered}"
@ -47,6 +48,7 @@ resource "matchbox_profile" "cached-container-linux-install" {
"coreos.first_boot=yes", "coreos.first_boot=yes",
"console=tty0", "console=tty0",
"console=ttyS0", "console=ttyS0",
"${var.kernel_args}",
] ]
container_linux_config = "${data.template_file.cached-container-linux-install-config.rendered}" container_linux_config = "${data.template_file.cached-container-linux-install-config.rendered}"

View File

@ -109,3 +109,9 @@ variable "container_linux_oem" {
default = "" default = ""
description = "Specify an OEM image id to use as base for the installation (e.g. ami, vmware_raw, xen) or leave blank for the default image" description = "Specify an OEM image id to use as base for the installation (e.g. ami, vmware_raw, xen) or leave blank for the default image"
} }
variable "kernel_args" {
description = "Additional kernel arguments the servers should boot with."
type = "list"
default = []
}

View File

@ -8,12 +8,11 @@ resource "matchbox_profile" "bootkube-worker-pxe" {
] ]
args = [ args = [
"root=/dev/sda1",
"coreos.config.url=${var.matchbox_http_endpoint}/ignition?uuid=$${uuid}&mac=$${mac:hexhyp}", "coreos.config.url=${var.matchbox_http_endpoint}/ignition?uuid=$${uuid}&mac=$${mac:hexhyp}",
"coreos.first_boot=yes", "coreos.first_boot=yes",
"console=tty0", "console=tty0",
"console=ttyS0", "console=ttyS0",
"kvm-intel.nested=1", "${var.kernel_args}",
] ]
container_linux_config = "${file("${path.module}/cl/bootkube-worker.yaml.tmpl")}" container_linux_config = "${file("${path.module}/cl/bootkube-worker.yaml.tmpl")}"

View File

@ -53,3 +53,14 @@ variable "kube_dns_service_ip" {
type = "string" type = "string"
default = "10.3.0.10" default = "10.3.0.10"
} }
# optional
variable "kernel_args" {
description = "Additional kernel arguments the server should boot with."
type = "list"
default = [
"root=/dev/sda1",
]
}