From 2272472d599de0cf51d0efbc2fafcd797de105db Mon Sep 17 00:00:00 2001
From: Bill ONeill <woneill@woneill.com>
Date: Sun, 23 Apr 2023 21:15:09 -0400
Subject: [PATCH] Omit -o flag to flatcar-install unless oem_type is defined

---
 bare-metal/flatcar-linux/kubernetes/butane/install.yaml        | 2 +-
 bare-metal/flatcar-linux/kubernetes/profiles.tf                | 2 +-
 bare-metal/flatcar-linux/kubernetes/worker/butane/install.yaml | 2 +-
 bare-metal/flatcar-linux/kubernetes/worker/matchbox.tf         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bare-metal/flatcar-linux/kubernetes/butane/install.yaml b/bare-metal/flatcar-linux/kubernetes/butane/install.yaml
index f3996e93..47d4fdfb 100644
--- a/bare-metal/flatcar-linux/kubernetes/butane/install.yaml
+++ b/bare-metal/flatcar-linux/kubernetes/butane/install.yaml
@@ -35,7 +35,7 @@ storage:
             -d ${install_disk} \
             -C ${os_channel} \
             -V ${os_version} \
-            -o ${oem_type} \
+            ${oem_flag} \
             ${baseurl_flag} \
             -i ignition.json
           udevadm settle
diff --git a/bare-metal/flatcar-linux/kubernetes/profiles.tf b/bare-metal/flatcar-linux/kubernetes/profiles.tf
index 6073a469..1537a408 100644
--- a/bare-metal/flatcar-linux/kubernetes/profiles.tf
+++ b/bare-metal/flatcar-linux/kubernetes/profiles.tf
@@ -55,7 +55,7 @@ data "ct_config" "install" {
     mac                = concat(var.controllers.*.mac, var.workers.*.mac)[count.index]
     install_disk       = var.install_disk
     ssh_authorized_key = var.ssh_authorized_key
-    oem_type           = var.oem_type
+    oem_flag           = var.oem_type != "" ? "-o ${var.oem_type}" : ""
     # only cached profile adds -b baseurl
     baseurl_flag = var.cached_install ? "-b ${var.matchbox_http_endpoint}/assets/flatcar" : ""
   })
diff --git a/bare-metal/flatcar-linux/kubernetes/worker/butane/install.yaml b/bare-metal/flatcar-linux/kubernetes/worker/butane/install.yaml
index f3996e93..47d4fdfb 100644
--- a/bare-metal/flatcar-linux/kubernetes/worker/butane/install.yaml
+++ b/bare-metal/flatcar-linux/kubernetes/worker/butane/install.yaml
@@ -35,7 +35,7 @@ storage:
             -d ${install_disk} \
             -C ${os_channel} \
             -V ${os_version} \
-            -o ${oem_type} \
+            ${oem_flag} \
             ${baseurl_flag} \
             -i ignition.json
           udevadm settle
diff --git a/bare-metal/flatcar-linux/kubernetes/worker/matchbox.tf b/bare-metal/flatcar-linux/kubernetes/worker/matchbox.tf
index bc050290..25cbf199 100644
--- a/bare-metal/flatcar-linux/kubernetes/worker/matchbox.tf
+++ b/bare-metal/flatcar-linux/kubernetes/worker/matchbox.tf
@@ -50,7 +50,7 @@ data "ct_config" "install" {
     mac                = var.mac
     install_disk       = var.install_disk
     ssh_authorized_key = var.ssh_authorized_key
-    oem_type           = var.oem_type
+    oem_flag           = var.oem_type != "" ? "-o ${var.oem_type}" : ""
     # only cached profile adds -b baseurl
     baseurl_flag = var.cached_install ? "-b ${var.matchbox_http_endpoint}/assets/flatcar" : ""
   })