upi/metal: Add pxe_kernel_args, stop using pxe_os_image_url

openshift · Jul 10, 2020 · 0402482 · 0402482
1 parent 839c787
commit 0402482
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/upi/metal/config.tf b/upi/metal/config.tf
@@ -132,13 +132,13 @@ EOF
 
 }
 
-variable "pxe_os_image_url" {
+variable "pxe_kernel_args" {
   type = string
+  default = ""
 
   description = <<EOF
-URL to the OS image for RHCOS that should be installed on machines.
-
-For more info: https://github.com/coreos/coreos-installer#kernel-command-line-options-for-coreos-installer-running-in-the-initramfs
+Arbitrary kernel arguments, space delimited ie:
+coreos.inst.image_url=http://example.com/image.gz coreos.color=blue
 EOF
 
 }

diff --git a/upi/metal/main.tf b/upi/metal/main.tf
@@ -8,8 +8,6 @@ locals {
 
     # "rd.break=initqueue"
     "coreos.inst=yes",
-
-    "coreos.inst.image_url=${var.pxe_os_image_url}",
     "coreos.inst.install_dev=sda",
     "coreos.inst.skip_media_check",
   ]
@@ -45,6 +43,7 @@ resource "matchbox_profile" "master" {
   args = concat(
     local.kernel_args,
     ["coreos.inst.ignition_url=${var.matchbox_http_endpoint}/ignition?cluster_id=${var.cluster_id}&role=master"],
+    ["${var.pxe_kernel_args}"],
   )
 
   raw_ignition = file(var.master_ign_file)
@@ -61,6 +60,7 @@ resource "matchbox_profile" "worker" {
   args = concat(
     local.kernel_args,
     ["coreos.inst.ignition_url=${var.matchbox_http_endpoint}/ignition?cluster_id=${var.cluster_id}&role=worker"],
+    ["${var.pxe_kernel_args}"],
   )
 
   raw_ignition = file(var.worker_ign_file)